title: Git files needs merge, but not present
body: <p>I am tryinng to merge update from a master code on another person's github page, and I have almost everything fixed. Now when I type <code>git checkout master</code> I get this in response:</p>
  
  <pre><code>$ git checkout master
  &gt; FtcRobotController/src/main/java/com/qualcomm/ftcrobotcontroller/opmodes/NullOp.java: needs merge
  &gt; doc/javadoc/com/qualcomm/robotcore/hardware/DcMotor.MotorCallback.html: needs merge
  &gt; error: you need to resolve your current index first
  </code></pre>
  
  <p>When I run <code>git diff</code> I get this:</p>
  
  <pre><code>&gt; Unmerged path FtcRobotController/src/main/java/com/qualcomm/ftcrobotcontroller/opmodes/NullOp.java
  &gt; Unmerged path doc/javadoc/com/qualcomm/robotcore/hardware/DcMotor.MotorCallback.html
  </code></pre>
  
  <p>Now these two files do not appear when I look through my file manager. </p>
  
  <p>Git newbie, please be kind to me. </p>