title: How to prefer files from one branch during a merge?
body: <p>Some time ago I created a branch from my <code>master</code> branch. Let's call it <code>new_feature</code>. While I was working on <code>new_feature</code>, the <code>master</code> branch followed its normal evolution. Now that <code>new_feature</code> is ready to be merged into <code>master</code> I see some conflicts, all of them are into files that are totally unrelated to the actual new feature (like some config files and the likes that have changed on <code>master</code>). I'm going to solve the conflicts manually but I was wondering, since it's a situation that happens quite often, how I could just merge the <code>new_feature</code> branch into <code>master</code> while always keeping the <code>master</code> version of the files in case of conflict?</p>
  
  <p>I'm sure it's easy and is related to something like 'keep version' but since it's a pretty sensitive subject I'd rather ask than be sorry.</p>