Git supports 'merge -s ours', but not 'merge -s theirs'. For a simple workaround, see https://gist.github.com/canton7/1268587 By vampire0 at 2016-04-19 23:50:58
Git supports 'merge - ours', but not 'merge -s theirs'. For a simple workaround, see https://gist.github.com/canton7/1268587 By canton7 at 2014-10-06 07:29:55