title: git merge of head with origin/master failed because of these files in Netbeans
body: <p>We are working with Netbeans and sometimes get an error when pulling/pushing from git</p>
  
  <p><strong>git merge of head with origin/master failed because of these files:
  ".../Filename.java"</strong></p>
  
  <p>What can we do? How to solve this in netbeans?
  We tried everything
   -> commit -> pull - same error
   -> commit -> push - same error</p>
  
  <p>no windows showing up where we can resolve the conflicts.</p>
  
  <p><strong>Edit:</strong> When I do: git pull with the git shell, then it works, the file will show me the conflict...</p>
  
  <p>But if I do the git pull via netbeans, netbeans doesnt show me anything, it keeps the file as it is without putting </p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt; HEAD:file.java
  blablabla
  ========
  blabla
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; 77976da35a11db4580b80ae27e8d65caf5208086:file.java
  </code></pre>
  
  <p>inside.</p>