are there any tools for resolving git merge conflicts which are different from (and maybe better than?) the classic 3-column merge tool?
(other than "manually edit the file yourself” obviously)
@b0rk and i've somehow managed to mix up "resolve using ours/theirs" enough times that i wish these tools, having already got such a 3-column style interface, would just have a "use the one on the left", "use the one on the right” pair of buttons. Or a “use this one” right there, on the one you want to use.
@StrangeNoises @b0rk oh and I would love it if this had any more information than "ours" and "theirs". Maybe at least the most recent commit message or something?
@claudius @StrangeNoises @b0rk
Or the representation of the (very small) relevant part of the commit graph.
@StrangeNoises @claudius @b0rk
To be fair, if you ask for conflict markers to just be written into the files at least Mercurial will put some headings that try to do what you ask for (https://wincent.com/wiki/Understanding_Mercurial_conflict_markers). However, they describe the two commits that are being merged, which still leaves me somewhat confused if I'm rebasing or cherry-picking (or, should I say, editing history or rebasing).
@robryk @claudius @b0rk more work though. my point would be that it would be *so easy* to just say which side, of the sides. you can see side by side right now, you want. or even simpler, thought of after this thread was alive: label which one is “yours" and which one "theirs”.