Error lines from build-log.txt
... skipping 35 lines ...
I0415 19:02:14.235] process 80 exited with code 0 after 0.0m
I0415 19:02:14.237] Call: git show -s --format=format:%ct HEAD
I0415 19:02:14.248] process 81 exited with code 0 after 0.0m
I0415 19:02:14.249] Call: git merge --no-ff -m 'Merge +refs/pull/2355/head:refs/pr/2355' f03695d9c992ba49fa091703fca364931cf14de3
I0415 19:02:14.720] Auto-merging docs/pipelines.md
I0415 19:02:14.722] CONFLICT (content): Merge conflict in docs/pipelines.md
I0415 19:02:14.722] Automatic merge failed; fix conflicts and then commit the result.
E0415 19:02:14.724] Command failed
I0415 19:02:14.724] process 82 exited with code 1 after 0.0m
E0415 19:02:14.724] 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 ...
