lk86/fix-merges-cleanly-job Check mergeability against all upstream branches #10133
Conversation
lk86
added
the
ci-build-me
buildkite/scripts/merges-cleanly.sh
Outdated
| # The git merge-tree command shows the content of a 3-way merge without | ||
| # touching the index, which we can then search for conflict markers. | ||
|
|
||
| git merge-tree `git merge-base origin/$BRANCH HEAD` origin/$BRANCH HEAD | grep "^<<<<<<<" |
There was a problem hiding this comment.
We discussed emitting a useful diff on our call; should we try to do that? It's probably fine to clobber the checkout and do a git merge origin/$BRANCH && git diff --exit-code
There was a problem hiding this comment.
This also appears not to be working correctly. If I locally check out this branch and git merge origin/feature/snapps-protocol, I see conflicts, but CI seems contented.
There was a problem hiding this comment.
I don't think its fine to clobber the checkout, i think a nontrivial amount of the local state is saved between runs in the same pipeline, but I will see about getting better debug output. Certainly I need to see more information to understand why it doesn't catch conflicts yet
There was a problem hiding this comment.
fixed, when there are merge conflicts the lines begin with +<<<<< so the grep needs "^+<<<<"
There was a problem hiding this comment.
Congrats, you are now successfully blocked from merging this 🤣
There was a problem hiding this comment.
I agree with Matthews' note of including the branch name in a future update (No conflict found with upstream branch $BRANCH).
I also note the ordering of trees in git merge-tree 'git merge-base origin/$BRANCH HEAD' origin/$BRANCH HEAD | grep "^<<<<<<<" but if the goal is to check against the specific branch and not "develop", this appears correct to me.
…ess review feedback
lk86
changed the title
This PR both fixes the check introduced some time ago for merge conflicts with develop, as well as extending the tool to check for conflicts with
compatibleandfeature/snapps-protocol.