How to resolve conflict of renamed folder of file in git?
<p>I have following problem:</p>

<p>I have some common commit A for two branches Branch1 and Branch2.</p>

<ul>
<li>Branch1 is a public branch (lies on server)</li>
<li>Branch2 is a  local branch</li>
</ul>

<p>In Branch1 I changed file (<code>BAD_folder/somefile.txt</code>). Changes were pushed to server. In Branch2 I renamed <code>BAD_folder</code> to <code>folder</code> and made some changes in <code>somefile.txt</code>. I want to merge Branch1 with Branch2, but I get a merge conflict in <code>BAD_folder/somefile.txt</code> file.</p>

<p>How can I resolve this?</p>