git ready » keep either file in merge conflicts

www.gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html

Saved 37 times on del.icio.us, most recently in 2012.

Tags: git merge conflict tutorial checkout conflicts howto programming versioncontrol tips

More links tagged git

More links tagged merge

More links tagged conflict