[llvm-branch-commits] [clang] Move rest of documentation problems that found their way to the SA section (PR #154608)
Balazs Benics via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Aug 25 09:16:01 PDT 2025
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
More information about the llvm-branch-commits
mailing list