3 ms·
Oh, and a special mention is deserved for Rider's git merge UI, which is by far the best I've used. It's based on 3 window panes: you get your code on the left
by GordonS 7y ago
Oh, and a special mention is deserved for Rider's git merge UI, which is by far the best I've used.
It's based on 3 window panes: you get your code on the left, theirs on the right, and the result in the middle, along with tools for accepting changes from either side, and you can edit the result pane at will too.
I've never liked the git merge UIs in VS or VS code (or other IDEs I've tried over the years) - Rider's is perfect for me.
- y4mi 7y agoJetbrains merge UI is like `git mergetool --tool=meld` (which you can use with x-tunneling on servers) Personally, I prefer vscode/atom style merging, but to each his own
- guitarbill 7y agodoesn't most three-way merge software have that UI? like kdiff3, meld, sublime merge, p4merge, vimdiff et al. (even think jetbrains products have it)
- leeman2016 7y agoThe thing is JetBrain's IDEs use that diff tool where-ever a diff is needed, not just for git. For example, in a local history of a file (like undo history), history of a single line in code, etc.