Meinersbur wrote: > There are some missing files in in flang-rt/CUDA both headers and cpp files.
Git tries to be helpful and move new files to the new location of where the sibling file went, but marking both locations of the same file as conflict. Not always obvious one is the "right" one. https://github.com/llvm/llvm-project/pull/110298 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
