On step 5, where I am supposed to commit, I get the following error:
fatal: cannot do a partial commit during a merge.
Sorry, the error is in the highlighted area. The lines following it were from my trying to do something else to fix it.
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.