title: Git merge: merge a file with a different file
body: <p>I have 2 branches A and B</p>
  
  <p>In branch A I renamed Thing.java to ThingImpl.java, and rewrote Thing.java so that it's now an interface. I also added quite a bit to ThingImpl.java.</p>
  
  <p>In branch B I edited the class in Thing.java</p>
  
  <p>Now I'm trying to merge my changes from branch A into branch B, and it's trying to merge my changes into the interface Thing.java instead of applying the diff to ThingImpl.java, which is what it should do. Is there a way to tell git to do this?</p>