Hmmm… I was thinking it would hard to generalize, but actually: if the patch is strictly a reformat, then the merge conflict resolution could be as simple as (a) take your downstream version of the file, (b) clang-format it.
2 Likes