To make it easier to work on patches, I tried setting git config --global am.threeWay true. This means when I run git go-patch apply, it will automatically do 3-way merges, rather than me needing to run git am -3 myself to see if that works.
The problem is that git go-patch extract uses am to detect whether a patch has changes and needs to be re-extracted. So, 3-way merge resolutions won't get checked into the dev's PR. CI doesn't use git am -3, so it fails to apply the patches. Noticed with https://github.com/microsoft/go/pull/1232.
Unsetting am.threeWay for the am used during git go-patch extract should be enough to fix this.
Intentionally setting am.threeWay=true during git go-patch apply might be nice, however this could be confusing, because it might not be obvious that some conflicts were resolved. I think this can wait for https://github.com/microsoft/go/issues/542.
To make it easier to work on patches, I tried setting
git config --global am.threeWay true. This means when I rungit go-patch apply, it will automatically do 3-way merges, rather than me needing to rungit am -3myself to see if that works.The problem is that
git go-patch extractusesamto detect whether a patch has changes and needs to be re-extracted. So, 3-way merge resolutions won't get checked into the dev's PR. CI doesn't usegit am -3, so it fails to apply the patches. Noticed with https://github.com/microsoft/go/pull/1232.Unsetting
am.threeWayfor theamused duringgit go-patch extractshould be enough to fix this.Workaround:
git config --global am.threeWay false.Intentionally setting
am.threeWay=trueduringgit go-patch applymight be nice, however this could be confusing, because it might not be obvious that some conflicts were resolved. I think this can wait for https://github.com/microsoft/go/issues/542.