mgudim wrote: > I think you can drop the merge commit using `git rebase -i`. You may have to > pass `--rebase-merges` to have the ability to drop the merge commit. Then you > can pull upstream and `git rebase upstream/main`.
Thanks Michael, I tried but messed it up (I see more changes than I intended). Let me try again. If I mess it up again, is it OK if I just close this PR and start over? https://github.com/llvm/llvm-project/pull/65535 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
