tru wrote: Pressing update branch won't rebase it here. You need to manually rebase the branch to get rid of the merge commits. If you check the commits tab you'll see it has two merge commits that contains the fixes for the merge. But if you manually checkout the PR and try to rebase it so that we only have the one commit it will end up with conflicts that are resolved in the first merge commit.
I wish we could disable the github update branch button on the release branch, but alas we can't. https://github.com/llvm/llvm-project/pull/151199 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
