title: Triggering Merge Window in Netbeans 8 GIT
body: <p>I am having issues wit a project that I put on github and am working on with two people.<br>
  As per the title I am using Netbeans 8 and it's in-built GIT support.</p>
  
  <p>The changes are about one line of one single file.</p>
  
  <p>On the remote repository it the line has the content:</p>
  
  <pre><code>System.out.println("Someone was here.");
  </code></pre>
  
  <p>I pulled the changes from the remote repo, so I have the same content at my local repo.</p>
  
  <p>Now I change that line to:</p>
  
  <pre><code>System.out.println("I was here.");
  </code></pre>
  
  <p>Then I can commit and push it just fine! And that is a big issue, because now I have overwritten his changes.</p>
  
  <p>So the <strong>question</strong>, why did it not trigger the resolve conflicts (merge) window, and how can I make sure that it will be triggered?</p>
  
  <p>I was expected something like, there is a conflict: Your local version has this content, the remote version has that content.</p>