git error: cannot do a partial commit during a merge.

After a pull command, I ended up with a conflict in a file, which I fixed by manually editing the file (search for the <<< signs). The merge is fine and therefore tried to commit the file again but got this error:

Using :

did not work, instead use

From the git documentation, the -i should be used to conclude a conflicted merge.

This entry was posted in Computer Science and tagged . Bookmark the permalink.

3 Responses to git error: cannot do a partial commit during a merge.

  1. Victor says:

    Thank you!

  2. Douglas says:

    Thank you

Leave a Reply

Your email address will not be published.