title: Git take their or my file while merging
body: <p>When doing a merge with upstream, git defaults to putting conflict information right into the files. E.g.</p>
  
  <pre><code>Here are lines that are either unchanged from the common
  ancestor, or cleanly resolved because only one side changed.
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; yours:sample.txt
  Conflict resolution is hard;
  let´s go shopping.
  =======
  Git makes conflict resolution easy.
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; theirs:sample.txt
  And here is another line that is cleanly resolved or unmodified.
  </code></pre>
  
  <p>Is there a way to take their or my changes for the whole file without editing it all by hand?</p>
  
  <p><strong>EDIT:</strong> I know there are options to <code>git merge</code> and <code>git pull</code>which make the whole merge take one side, but once you started the merge in conflict mode, this is no longer possible. Aside from that I don't want to take ALL changes from one side, but decide manually per file.</p>