Error lines from build-log.txt
... skipping 35 lines ...
I0415 18:58:59.586] process 81 exited with code 0 after 0.0m
I0415 18:58:59.586] Call: git show -s --format=format:%ct HEAD
I0415 18:58:59.591] process 82 exited with code 0 after 0.0m
I0415 18:58:59.591] Call: git merge --no-ff -m 'Merge +refs/pull/2355/head:refs/pr/2355' d1a84416c7dd36492ad024d7e203f1ab7c7a43c6
I0415 18:59:00.124] Auto-merging docs/pipelines.md
I0415 18:59:00.125] CONFLICT (content): Merge conflict in docs/pipelines.md
I0415 18:59:00.125] Automatic merge failed; fix conflicts and then commit the result.
E0415 18:59:00.126] Command failed
I0415 18:59:00.126] process 83 exited with code 1 after 0.0m
E0415 18:59:00.126] 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 ...
