Error lines from build-log.txt
... skipping 35 lines ...
I0410 20:07:09.974] process 82 exited with code 0 after 0.0m
I0410 20:07:09.974] Call: git show -s --format=format:%ct HEAD
I0410 20:07:09.979] process 83 exited with code 0 after 0.0m
I0410 20:07:09.980] Call: git merge --no-ff -m 'Merge +refs/pull/2355/head:refs/pr/2355' 5af1d938f1fcb008d93409fc08a3bb90ca649959
I0410 20:07:10.546] Auto-merging docs/pipelines.md
I0410 20:07:10.547] CONFLICT (content): Merge conflict in docs/pipelines.md
I0410 20:07:10.547] Automatic merge failed; fix conflicts and then commit the result.
E0410 20:07:10.547] Command failed
I0410 20:07:10.547] process 84 exited with code 1 after 0.0m
E0410 20:07:10.548] 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 ...
