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>

Leave a Reply

Your email address will not be published. Required fields are marked *