I'm having troubles to resolve a problem I have on my working copy: earlier I pulled and it auto-merged a couple of files, they showed then up in the staged area from where I did not commit. I reverted the changes in the files by git checkout -- my/file now, later in the day, I wanted to do another pull but it can't, I got an error like:
$ git pull error: You have not concluded your merge (MERGE_HEAD exists). hint: Please, commit your changes before merging. fatal: Exiting because of unfinished merge. how can I fix the situation? I don't want to commit anything on this branch! I also get:
$ git status On branch dev Your branch and 'origin/dev' have diverged, and have 3 and 4 different commits each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. (use "git commit" to conclude merge) Untracked files: (use "git add <file>..." to include in what will be committed) 
git pullmeans run two Git commands: first, rungit fetch, then run a second Git command. The second command defaults togit merge. If you rangit pullearlier, it probably already rangit merge(depending on whether you changed the second command for yourgit pull). This is probably the reason you're still in the middle of a conflicted merge. You must either finish this merge, or abort it, before you can do anothergit pull.