title: Git conflict (rename/rename)
body: <p>After merging branched I've received a <code>conflict (rename/rename)</code> on bunch of files, with <code>file~HEAD</code>, and <code>file~my_test_branch</code> created. How to resolve these?</p>
  
  <p>Thanks</p>