Last year, I made some suggestion to improve conflict reporting in clang-apply-replacements (https://reviews.llvm.org/D43764).
I have a very simple implementation of a VCS conflict marker to share and get some feedbacks if this approach could get some interests.
Details
Details
Diff Detail
Diff Detail