title: git: can I accept both changes in a merge conflict without editing files?
body: <p>I usually have merge conflicts on Rails locale files, for example:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
    label_company_offices: "Branches"
  =======
    field_amounts_withheld: "Withheld amount"
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; master
  </code></pre>
  
  <p>here I have to edit every locale file, can I avoid this?</p>
  
  <p>there's any way to tell git "resolve conflict accepting both changes"?</p>