[Docs][Github] explain how to rectify gh pr merge failure #66223
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nickdesaulniers
commented
Sep 13, 2023
|
|
||
| :: | ||
|
|
||
| git push -f |
There was a problem hiding this comment.
It's probably worth noting that this may ask you to push potentially hundreds or thousands of patches and that this is OK.
Example.
Are you sure you want to push 248 commits? (y/N): y
This is fine, since you're pushing to a branch in your fork. The results can be seen at the bottom of #66003; only my 3 rebased commits are listed, not all 248 commits since I initially authored that PR.
There was a problem hiding this comment.
Just a note to fellow reviewers, here's the error message you will observe if you do not update your PR with the rebased version:
$ gh pr merge --squash --delete-branch
! Pull request #66003 ([InlineAsm] wrap ConstraintCode in enum class NFC) has diverged from local branch
Message: Pull Request is not mergeable, Locations: [{Line:1 Column:58}]
and if you try to push (without -f):
$ git push
To github.com:nickdesaulniers/llvm-project.git
! [rejected] inlineasm_constraint -> inlineasm_constraint (non-fast-forward)
error: failed to push some refs to 'github.com:nickdesaulniers/llvm-project.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
(though that is probably more obvious)
tru
reviewed
Sep 13, 2023
MaskRay
approved these changes
Sep 13, 2023
I recently went to merge a PR that had a merge conflict:
$ gh pr merge --squash --delete-branch
X Pull request llvm#66003 is not mergeable: the merge commit cannot be cleanly created.
To have the pull request merged after all the requirements have been met, add the `--auto` flag.
Run the following to resolve the merge conflicts locally:
gh pr checkout 66003 && git fetch origin main && git merge origin/main
This is how I resolved it; we should recommend this explicitly for
fellow contributors.
nickdesaulniers
force-pushed
the
gh_docs
branch
from
5f8e106
to
71088c3
Compare
ZijunZhaoCCK
pushed a commit
to ZijunZhaoCCK/llvm-project
that referenced
this pull request
Sep 19, 2023
I recently went to merge a PR that had a merge conflict:
$ gh pr merge --squash --delete-branch
X Pull request llvm#66003 is not mergeable: the merge commit cannot be
cleanly created.
To have the pull request merged after all the requirements have been
met, add the `--auto` flag.
Run the following to resolve the merge conflicts locally:
gh pr checkout 66003 && git fetch origin main && git merge origin/main
This is how I resolved it; we should recommend this explicitly for
fellow contributors.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I recently went to merge a PR that had a merge conflict:
This is how I resolved it; we should recommend this explicitly for
fellow contributors.