Me and my friend were working on a branch. When my friend completed his work and push his work on the branch that we were working on.
Now I was about to pull the work done by him but instead of pulling from the branch that he was working on I mistakenly pulled from the master branch.
and there occurs a conflict. I know how to fix a conflict but I don't want to merge master into my working branch. therefore to rollback I used following commands
git reset .
git checkout -- .
this restored all the files back to the latest local commit. (I think so)
But when I do git status
it show some untracked files and also displays a message that says "All conflicts fixed but you are still merging."
Now I don't know what should I do to make sure that the whole project directory is restored to its original state before pulling the master branch.