Pol Marcet =?utf-8?q?Sardà?= <polmarcetsa...@gmail.com>, Pol Marcet =?utf-8?q?Sardà?= <polmarcetsa...@gmail.com>, Pol Marcet =?utf-8?q?Sardà?= <polmarcetsa...@gmail.com>, Pol Marcet =?utf-8?q?Sardà?= <polmarcetsa...@gmail.com> Message-ID: In-Reply-To: <llvm.org/llvm/llvm-project/pull/76...@github.com>
sethp wrote: Well, good news and bad news: I succeeded in trying to save one more cycle by asking you to fix the conflict in ReleaseNotes.rst, and these changes are in the llvm-project's main branch: 2903df02fb3c057849aaa796a91289b01950a5f0 (sorry for mucking up the title, that's one for me to grow on). The bad news is that github did not consider this an ["indirect merge"](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#indirect-merges) as it would have if I'd authored a merge commit resolving the conflict. So we have a couple options that I see: * Mark the PR as "closed" instead of "merged" and celebrate anyway * @Destroyerrrocket you could try force-pushing your branch to that commit (`git push --force-with-lease https://github.com/Destroyerrrocket/llvm-project.git 2903df02fb3c057849aaa796a91289b01950a5f0:refs/heads/Destroyerrrocket-users/destroyerrocket/46593` ought to do it), which github will hopefully recognize as associating the two properly * or, some further git shenanigans like ``` git reset --hard 2903df02fb3c057849aaa796a91289b01950a5f0 git commit --allow-empty -m 'Mark PR#76615 as integrated' git push --force-with-lease ``` and then we hit the "squash and merge" button on _that_. What do y'all think? https://github.com/llvm/llvm-project/pull/76615 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
