title: git merge conflict due to moved files
body: <p>I have not done so much with git so far. Now, I have the following problem.
  While I did some local modifications and commits, my colleague restructured files and folders within a new branch. Then, I added a remote tracking branch (reflecting his changes) and tried to merge my modifications into it. Of course it fails as the files moved to another location. How can I go onwards? 
  A 'git status' shows me this:</p>
  
  <pre><code># On branch develop
  # You have unmerged paths.
  #   (fix conflicts and run "git commit")
  #
  # Unmerged paths:
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #   deleted by us:      src/de/mpicbg/tds/knime/hcstools/prefs/DoubleFieldEditor.java
  #   deleted by us:      src/de/mpicbg/tds/knime/hcstools/prefs/HCSToolsPreferencePage.java
  #   deleted by us:      src/de/mpicbg/tds/knime/heatmap/HeatMapModel.java
  #   deleted by us:      src/de/mpicbg/tds/knime/heatmap/PlateViewer.java
  #   deleted by us:      src/de/mpicbg/tds/knime/heatmap/color/LinearGradientTools.java
  #   deleted by us:      src/de/mpicbg/tds/knime/heatmap/dialog/PlateAttributeDialog.java
  #   deleted by us:      src/de/mpicbg/tds/knime/heatmap/menu/TrellisMenu.java
  #   deleted by us:      src/de/mpicbg/tds/knime/heatmap/menu/ViewMenu.java
  #   deleted by us:      src/de/mpicbg/tds/knime/heatmap/menu/WellAttributeComboBox.java
  #   deleted by us:      src/de/mpicbg/tds/knime/heatmap/renderer/HeatTrellis.java
  #
  # Untracked files:
  #   (use "git add &lt;file&gt;..." to include in what will be committed)
  #
  #   bin/
  #   src/de/mpicbg/tds/knime/heatmap/HeatMapModel.ucls
  #   src/de/mpicbg/tds/knime/heatmap/diagram.ucls
  no changes added to commit (use "git add" and/or "git commit -a")
  </code></pre>
  
  <p>I'm not sure what to do now...</p>