GIT: conflict resolve on pull or merge

Theirs on top
git pull -s recursive -X theirs <remote> <branch>
git merge -s recursive -X theirs <branch>

My on top
git pull -s recursive -X ours <remote> <branch>
git merge -s recursive -X ours <branch>

This entry was posted in git. Bookmark the permalink. Post a comment or leave a trackback: Trackback URL.

Post a Comment

Your email is never published nor shared. Required fields are marked *


You may use these HTML tags and attributes: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <del datetime=""> <em> <i> <q cite=""> <strike> <strong> <pre lang="" line="" escaped="">