4 ms·

Am I the only one that prefers manually resolving conflicts in a text editor? It sucks but I can't imagine a GUI that sucks less

softfalcon 4y ago
Nope! I’ve done this for years now. It made the most sense to me. Some people are at a loss as to how I can resolve a conflict without any tools (other than git + text edit) though, feels like a super power!
bmn__ 4y ago
<https://apps.kde.org/kdiff3 https://apps.kde.org/kdiff3> is partially a text editor, try it out and develop an appreciation for it.
- mkoubaa 4y ago
  I have and use kdiff3 regularly for other purposes
spyremeown 4y ago
Try any of the recommendations here (my poison is Meld). It's actually one of the few tasks where I really, really do prefer a GUI over text.
bmitc 4y ago
I like using Perforce's three-way merge. The only thing confusing is Git's ridiculous naming for remote and local.
taspeotis 4y ago
> The central pane is a fully-functional editor where the results of resolving conflicts are displayed. Initially, the contents of this pane are the same as the base revision of the file, that is, the revision from which both conflicting versions are derived. https://www.jetbrains.com/help/rider/Resolve_conflicts.html https://www.jetbrains.com/help/rider/Resolve_conflicts.html
fhaldridge7 4y ago
Same for me. Always used a text editor.
askvictor 4y ago
A triple-panel editor has made this much less scary for me over the years. Jetbrains do it really well, I think I've used VS Code for this too.
- Too 4y ago
  You actually need four panels; common ancestor, yours, theirs, and finally the merge-result. This is how Kdiff3 and Beyond compare does it and it is far superior to just having three panels. A lot of other tools leave out the base or combine it with the result-panel, making it very hard to see what has changed from each side once you start resolving conflicts. A 4K monitor is also a must.
  - gpvos 4y ago
    I think there's a terminology confusion here. I call kdiff3 and BC a three-panel display, because it shows the original and the two changed versions as three panels next to each other. Since the result is shown separately below, I don't include it in the panel count. I only realized that strictly speaking you could also count it as a panel from your post.

softfalcon 4y ago

Nope! I’ve done this for years now. It made the most sense to me. Some people are at a loss as to how I can resolve a conflict without any tools (other than git + text edit) though, feels like a super power!

bmn__ 4y ago

<https://apps.kde.org/kdiff3 https://apps.kde.org/kdiff3> is partially a text editor, try it out and develop an appreciation for it.

mkoubaa 4y ago
I have and use kdiff3 regularly for other purposes

spyremeown 4y ago

Try any of the recommendations here (my poison is Meld). It's actually one of the few tasks where I really, really do prefer a GUI over text.

bmitc 4y ago

I like using Perforce's three-way merge. The only thing confusing is Git's ridiculous naming for remote and local.

taspeotis 4y ago

> The central pane is a fully-functional editor where the results of resolving conflicts are displayed. Initially, the contents of this pane are the same as the base revision of the file, that is, the revision from which both conflicting versions are derived. https://www.jetbrains.com/help/rider/Resolve_conflicts.html https://www.jetbrains.com/help/rider/Resolve_conflicts.html

fhaldridge7 4y ago

Same for me. Always used a text editor.

askvictor 4y ago

A triple-panel editor has made this much less scary for me over the years. Jetbrains do it really well, I think I've used VS Code for this too.

Too 4y ago
You actually need four panels; common ancestor, yours, theirs, and finally the merge-result. This is how Kdiff3 and Beyond compare does it and it is far superior to just having three panels. A lot of other tools leave out the base or combine it with the result-panel, making it very hard to see what has changed from each side once you start resolving conflicts. A 4K monitor is also a must.
- gpvos 4y ago
  I think there's a terminology confusion here. I call kdiff3 and BC a three-panel display, because it shows the original and the two changed versions as three panels next to each other. Since the result is shown separately below, I don't include it in the panel count. I only realized that strictly speaking you could also count it as a panel from your post.