I worked through the steps as instructed but I can't get past Step 5. Here's what happened:
$ git checkout master Switched to branch 'master' $ git merge fencing Auto-merging resume.txt CONFLICT (content): Merge conflict in resume.txt Automatic merge failed; fix conflicts and then commit the result. $ git add resume.txt $ git commit resume.txt -m "Resolve merge conflict" fatal: cannot do a partial commit during a merge.
That last bit is Step 5 - cannot do a partial commit during a merge. But I followed all instructions so I'm really confused. Does anyone know what I did wrong?
I went back two exercises and redid them, following instructions very carefully. But when I get to this Step 5 I'm still getting the error message. I used the command line to go back into the fencing branch, and commit there. Then it let me pass the exercise, but I can't get past the next one - I got a similar error message. So the problem has to be in this exercise somewhere.