3 ms·

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

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.

rjmunro 5y ago
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.
cerved 5y ago
git mergetool or git checkout --ours/theirs && git add .