abort

When there are conflicts after the git pull, use git merge --abort. Now the project reset to whatever state it was before merge.