stefanv, 4 months ago

@ctietze This would be convenient, but I'm not highly optimistic:

From git's source, xmerge.c:

        memset(dest + size, '<', marker_size);<br></br>        size += marker_size;<br></br>        if (marker1_size) {<br></br>            dest[size] = ' ';<br></br>            memcpy(dest + size + 1, name1, marker1_size - 1);<br></br>            size += marker1_size;<br></br>        }<br></br>

However, perhaps

git config --global merge.conflictStyle diff3<br></br>

helps a little bit?

https://magit.vc/manual/magit/Resolving-Conflicts.html

stefanv, 4 months ago

@ctietze And, if you're willing to use an external merge tool:

[merge]<br></br>    tool = meld<br></br>

https://meldmerge.org/
https://git-scm.com/docs/git-mergetool

ctietze, 4 months ago

@stefanv Yellow/blue color scheme is already great. Can't see red/green well 👍

I still run into cases like the one from the screenshot where I don't know which side is which.

ctietze, 4 months ago

@stefanv If the commit that's being referenced/diffed would be part of the UI (e.g. in the bottom/status bar) with a data maybe, that would help with context already!

Hmmm

stefanv, 4 months ago

@ctietze Maybe two sticky notes, one on each side of the screen 😅

ctietze, 4 months ago

@stefanv Then I need a git-controlled label printer :D

stefanv, 4 months ago

@ctietze 😂 Presumably, they don't jump around (or do they?!). Here's what you see when enabling 3-way merge.

I made the file, modified it in two branches (A and B), merged A onto main, then tried to merge B onto main.

I see the filenames include LOCAL and REMOTE, which also provides a hint.

ctietze, 4 months ago

@stefanv Thanks for checking! It should be possible for an app to gather more info, though, than these filename crutches. The commit for example only needs to be fetched once per resolution step, not even per file.

Got to check this out and propose patches left and right

stefanv, 4 months ago

@ctietze Nice, thanks! Please keep me in the loop, and feel free to tag me on related issues / patches.

ctietze, 4 months ago

@stefanv oh dear it's a Python app :) That's interesting