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 quickthrower2 on Monday June 21, 2021 @01:11PM (#27581181)
I feel that I only understand git because I’m forced to use it for years, but the experience could have been a lot less painful. I use a GUI for sure. Do people really diff and resolve big conflicts at a command line? I never figured out how.
[ Parent | on HN ]
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 ]
Re:Git undo: We can do better by cerved on Monday June 21, 2021 @02:32PM (#27582226) 

  git mergetool
or

  git checkout --ours/theirs && git add .
[ Parent | on HN ]