title: IntelliJ Idea VCS shows three files
body: <p>Hi when I click on Intellij Idea's VCS code it shows me diff between three files - one with SHA1 hash , other the base version and third the server version. Please explain what do they refer too.I want to keep other users' changes and merge my change.We are using git as VCS. This problem comes when I try to take a pull.It says :</p>
  
  <pre><code>error: Pull is not possible because you have unmerged files.
  hint: Fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  hint: as appropriate to mark resolution and make a commit.
  fatal: Exiting because of an unresolved conflict.
  </code></pre>
  
  <p>If it helps I can post output of git diff command.Thanks in advance.</p>