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 rjmunro on Monday June 21, 2021 @01:49PM (#27581650)
Just delete the bits you don't want and `git add`

It helps a lot to set:

git config --global merge.conflictstyle diff3

then you can see the before as well as the 2 changes you are trying to resolve.

[ Parent | on HN ]

There are no comments on this comment yet.