Friday, 5 September 2014

Git merge replacing local changes with 'theirs'

$ git merge -s recursive -Xtheirs <branch_name>