aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Serialization/ModuleManager.cpp
diff options
context:
space:
mode:
authorNick Desaulniers <nickdesaulniers@users.noreply.github.com>2023-09-13 14:03:24 -0700
committerGitHub <noreply@github.com>2023-09-13 14:03:24 -0700
commit102715a60ee45d04b5ba687a8728acd21e61494a (patch)
tree7a959fa304f8beb25f3691d48b3479631d4534af /clang/lib/Serialization/ModuleManager.cpp
parent2793ef6797a406abf983139b2a18b30a9e277687 (diff)
downloadllvm-102715a60ee45d04b5ba687a8728acd21e61494a.zip
llvm-102715a60ee45d04b5ba687a8728acd21e61494a.tar.gz
llvm-102715a60ee45d04b5ba687a8728acd21e61494a.tar.bz2
[Docs][Github] explain how to rectify gh pr merge failure (#66223)
I recently went to merge a PR that had a merge conflict: $ gh pr merge --squash --delete-branch X Pull request #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.
Diffstat (limited to 'clang/lib/Serialization/ModuleManager.cpp')
0 files changed, 0 insertions, 0 deletions