https://github.com/kasuga-fj commented:
FWIW, using merge instead of rebase might be a better. That way, you might avoid resolving the same conflicts repeatedly. https://github.com/llvm/llvm-project/pull/142686 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
