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

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.