Merging a branch when I don't want conflicts
From: Geoff Russell <hidden>
Date: 2016-06-15 22:46:47
How do I merge a branch X into my master and tell git that whenever there is a conflict, the file on X should prevail? This is for a scripted application. Cheers, Geoff