title: How to resolve conflicts with git merge without committing unwanted files?
body: <p>I have a problem resolving a conflict with git merge. When I tried the command <code>git merge branch_1</code> a conflict with a file appeared. I was able to succesfully resolve it using <code>git mergetool</code> with Meld. The problem is, after I have done it, I tried again to merge but it says that I have to commit my changes to conclude the merge. So before doing that I checked the <code>git status</code> and I found that there is a bunch of files in the staging area that I haven't modified. I guess those files where brought by the failed merge, but now how am I supposed to finish the merge without committing those files? Thanks!</p>