Cannot do a partial commit during a merge


#1



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


On step 5, where I am supposed to commit, I get the following error:
fatal: cannot do a partial commit during a merge.


#2

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

Thanks!


#3

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


#4

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,


#5

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