title: How do I solve "error: Merging is not possible because you have unmerged files."?
body: <p>When I enter <code>git merge &quot;my-most-up-to-date-branch&quot;</code> I get the following error:</p>
  <p><a href="https://i.stack.imgur.com/HqImH.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/HqImH.png" alt="enter image description here" /></a></p>
  <p>Problem is that I don't know where to start, at all. There are differences in .py files which I can edit by hand. But, also ones that can't fixed by hand like .db , .pyc files.</p>
  <p>This is what I get when I enter <code>git mergetool</code>:</p>
  <p><a href="https://i.stack.imgur.com/U87Ur.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/U87Ur.png" alt="enter image description here" /></a></p>
  <p>Also, I am not sure whether I understand what happens if I enter &quot;m&quot; or &quot;d&quot; in the second picture. Project's most up-to-date version is in the branch &quot;reset-password&quot;. How do I solve this issue?</p>
  <p>ps: I am sure there is a way to handle this without using merge and making &quot;reset-password&quot; my new &quot;master&quot; branch. However, I really do want to be able to handle this problem by using merge so that I can be able to handle similar problems in my future professional life.</p>