ProAnswers.org

How to resolve merge conflicts in Git?

The Git manual has some very good instructions, including helpful examples, on handling merge conflicts