hint: after resolving the conflicts, mark the corrected paths

git git-merge git-revert git-cherry-pick git-merge-conflict
paullb picture paullb · Jun 11, 2015 · Viewed 38.7k times · Source

git sometimes gives me this message on a conflict (during a revert or cherry pick)

hint: after resolving the conflicts, mark the corrected paths

What does this mean?

Answer

Nick Volynkin picture Nick Volynkin · Jun 11, 2015

This means that you need to explicitly tell Git that you've resolved a conflict at each file or folder (that is path).

Showing the list of yet unresolved conflicts:

git status

Marking a conflict as resolved.

File or all files in a folder should be left and all conflicts are resolved:

git add

File or folder should be removed:

git rm

Next step:

git commit

Related questions

Re-doing a reverted merge in Git

I have run into a bit of a problem here: I had a problem-specific branch 28s in Git, that I merged in the general develop branch. Turns out I had done it too fast, so I used git-revert to undo …

Read More
Which commit hash to undo a pushed merge using git-revert?

I merged the beta branch into the master branch. I pushed to origin. I now want master to be as it was prior to the merger both locally and remotely. A good answer for undoing a merge that was already …

Read More
How to resolve merge conflicts in Git repository?

I want to resolve merge conflicts in my Git repository. How to do that ?

Read More