Question

I do a

git pull

and I get merge conflicts. I resolve the merge conflicts manually and issues a pull again but Git refuses to do it as Git is still thinking that there are merge conflicts.

Is there any way to force Git to perform a pull again and make it look for “diffs” (if any ) from the head(without committing the changes I made) ?

Answer 1

Why are you issuing a second git pull after fixing the merge conflicts from the first? That makes no sense. Once you fix the merge conflicts, you want to git commit instead, which will create the merge commit that merges the remote branch with your local one (and includes your conflict resolutions).