Error lines from build-log.txt
... skipping 35 lines ...
I0415 19:00:59.684] process 81 exited with code 0 after 0.0m
I0415 19:00:59.684] Call: git show -s --format=format:%ct HEAD
I0415 19:00:59.688] process 82 exited with code 0 after 0.0m
I0415 19:00:59.689] Call: git merge --no-ff -m 'Merge +refs/pull/2355/head:refs/pr/2355' 90f8c56018a4833be85b59a36726d7ab532c6b15
I0415 19:01:00.101] Auto-merging docs/pipelines.md
I0415 19:01:00.101] CONFLICT (content): Merge conflict in docs/pipelines.md
I0415 19:01:00.101] Automatic merge failed; fix conflicts and then commit the result.
E0415 19:01:00.102] Command failed
I0415 19:01:00.103] process 83 exited with code 1 after 0.0m
E0415 19:01:00.103] unexpected error
Traceback (most recent call last):
File "./test-infra/jenkins/bootstrap.py", line 1096, in bootstrap
File "./test-infra/jenkins/bootstrap.py", line 981, in setup_root
File "./test-infra/jenkins/bootstrap.py", line 307, in checkout
File "./test-infra/jenkins/bootstrap.py", line 1054, in <lambda>
File "./test-infra/jenkins/bootstrap.py", line 149, in _call
... skipping 35 lines ...
