How Do I Fix Merge Conflicts in Git? - Stack Overflow

stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git

Saved 85 times on del.icio.us, most recently in 2013.

Tags: git merge conflict conflicts tips reference development scm help tutorial

More links tagged git

More links tagged merge

More links tagged conflict