Error lines from build-log.txt
... skipping 35 lines ...
I0410 17:38:33.397] process 82 exited with code 0 after 0.0m
I0410 17:38:33.397] Call: git show -s --format=format:%ct HEAD
I0410 17:38:33.402] process 83 exited with code 0 after 0.0m
I0410 17:38:33.403] Call: git merge --no-ff -m 'Merge +refs/pull/2355/head:refs/pr/2355' 4d7f565ae4a884b3ec58ae164790a59e72767f5a
I0410 17:38:33.826] Auto-merging docs/pipelines.md
I0410 17:38:33.827] CONFLICT (content): Merge conflict in docs/pipelines.md
I0410 17:38:33.827] Automatic merge failed; fix conflicts and then commit the result.
E0410 17:38:33.828] Command failed
I0410 17:38:33.828] process 84 exited with code 1 after 0.0m
E0410 17:38:33.828] 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 ...
