Information about git conflicts is stored in the index, not the work tree. They are resolved by adding, with
git add
, the resolved content. It follows that deleting local files won't have any effect.git pull
never generates conflict with local files. It will complain that your work directory is not clean instead. Deleting local files therefore won't help (if you did it before runninggit pull
, it would cause it to complain the working directory is not clean and not do anything).Therefore the conflict is between the branch that was checked out before and the branch you want to pull.
I suppose you want to have the exact content that you pulled, right? In that case
`git reset --hard origin/master`
should be the fastest way. It tells git to check out the content of the branch master
pulled from origin
(adjust appropriately if you are using different branch), overwriting any previous content of the working tree, and make the current branch point to that revision.