3 ms·
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.
by 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 agoYou 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 agoI 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.