Fatal: cannot do a partial commit during a merge

Language Help Git
1

<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.>
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.>
I assume that I have incorrectly deleted or rather did not delete some text during the add statement however I cannot tell what.

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

1920×1080 152 KB

2

Alright I’ve solved my own problem.
By calling the file name when I used commit, bash thought that I was attempting to only commit that file and it was telling me to make sure I’ve fixed all of them before continuing.
I think
Anyway it works now.

3

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