iamaayushrivastava wrote: > It has a conflict in the release notes which you need to rebase. Once you do, > you can just merge because everything else is good. > > To avoid constant merge conflicts in the release notes, instead of appending > your new item to the end of the bullet list, pick a random spot to add it > instead.
Thanks for the review! Rebased onto the latest main, resolved the release notes conflict, and moved our entry to a middle position in the list to avoid future conflicts. https://github.com/llvm/llvm-project/pull/200161 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
