Sirraide wrote: > Merging main into your branch tends to do that.
I’m not sure if this is the case, but my theory is that it’s specifically creating a new commit on merge that does that. After resolving conflicts, you have to run `git merge --continue` instead of committing manually. I always merge main instead of rebasing and I’ve never had any issues, but I’ve seen this happen to people several times. https://github.com/llvm/llvm-project/pull/123495 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
