News for hackers. Stuff that matters.

A comment on Git undo: We can do better. Parent comment

Re:Git undo: We can do better by tcoff91 on Monday June 21, 2021 @12:04PM (#27580492)
even if you use the git CLI you can still set up a mergetool so that when you are resolving merge conflicts you can use something like BeyondCompare or P4Merge to handle the merge conflicts.
[ Parent | on HN ]
Re:Git undo: We can do better by Hamuko on Monday June 21, 2021 @12:08PM (#27580560)
And every Xcode installation on macOS comes with FileMerge.app.
[ Parent | on HN ]
Re:Git undo: We can do better by mixmastamyk on Monday June 21, 2021 @01:36PM (#27581496)
Meld
[ Parent | on HN ]