[0/1] Provide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc'

Message

John Cai via GitGitGadget Jan. 29, 2019, 10:56 a.m. UTC

There are merge conflicts that do not result in merge conflict markers: e.g.
when one branch extends a function's signature, and another branch adds a
caller.

In this instance, sg/travis-specific-cc wants to use gcc-8 in the osx-gcc 
job (which is already installed, but not linked, on Travis' macOS agents),
and js/vsts-ci wants to run the tests on Azure Pipelines (where gcc-8 is not
installed by default).

So this fixup is necessary to fix that conflict.

To see that this is necessary, I kicked off a public build and you can see
the symptom of the problem here
[https://dev.azure.com/git/git/_build/results?buildId=318&view=logs&jobId=51041795-01c5-57f3-5561-107b6b9e51a6&taskId=fadc714a-a906-5cf2-cc7a-335e443ad2f8&lineStart=326&lineEnd=327&colStart=1&colEnd=71]
.

Johannes Schindelin (1):
  fixup! Merge branch 'js/vsts-ci' into pu

 ci/lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: c7baf85843ec1dc8272483baa2f84d0ec66ad882
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-113%2Fdscho%2Fosx-gcc%408-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-113/dscho/osx-gcc@8-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/113