Which difftool do you use and why? I develop on Windows and I use KDiff3. It has worked flawlessly all these years. And just because of that I haven’t really followed what else is out there. I suspect I’m in the minority?
Which difftool do you use and why? I develop on Windows and I use KDiff3. It has worked flawlessly all these years. And just because of that I haven’t really followed what else is out there. I suspect I’m in the minority?
I have two.
I prefer Fork since it’s stupidly easy to rebase, and it’s stupidly easy to stage by line instead of by file. This lets me split my changes into different logical commits which makes reviewing those changes back so much faster.
I can’t help but cringe when I see devs add every change to a single commit instead of separating their changes.
Being able to stage only specific lines of files allows you to finalise one part of your changes that you know are finished, while you’re still half way through with your other change.
What’s easier to read?
Branch 1 (the commit everything in a file approach):
Branch 2 (the commit the relevant lines approach):
Now if I realise later on that the bugfix had an unintentional side effect, I can single out the bugfix by itself, and not need to figure out why debugging messages are getting sent, or why a whole bunch of variables in another spot were changed.