steakhal wrote: > Seems like this still have conflicts? do you have time to look at this now > @steakhal ? otherwise I'll make an attempt at resolving it before the final > release tomorrow, but it would be better if you did it since you know what to > expect.
There was nothing serious. The default git merge strategy resolved it automatically using "ort". It seems like GitHub does not use the "ort" strategy for automatic resolutions. Nevertheless, here it is. @tru https://github.com/llvm/llvm-project/pull/154608 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
