Cannot do a partial commit during a merge

<PLEASE USE THE FOLLOWING TEMPLATE TO HELP YOU CREATE A GREAT POST!>

<Below this line, add a link to the EXACT exercise that you are asking about.>
Learn Git, Branching, Merge II (8/10)
https://www.codecademy.com/courses/learn-git/lessons/git-branching/exercises/merge-conflict-2?action=lesson_resume&link_content_target=interstitial_lesson

<Below this line, describe in what way does your code behave incorrectly? Include ALL error messages.>
On step 5, where I am supposed to commit, I get the following error:
fatal: cannot do a partial commit during a merge.

<Below this line, add a screenshot of your whole web browser so that we can see what you see.>

Sorry, the error is in the highlighted area. The lines following it were from my trying to do something else to fix it.

Thanks!

okay, figured it out. needed to not type resume.txt when committing. Not sure why, though.

When you specify filename(s) to git commit you are telling git to only commit those and not what’s currently staged, that’s not something you can do while you’re merging,

This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.