title: Git in netbeans - resolving conflicts
body: <p>I am using Git in netbeans and I wanted to commit my changes, however first I did a pull, and now there are conflicts.</p>
  
  <p>On the left, I have a .java class that is in red because of conflicts, and I've right clicked it and selected Resolve Conflicts, and went through those steps. </p>
  
  <p>But it still won't let me commit. I would like to override the current HEAD revision with my code, however it won't let me commit. How do I do this? </p>
  
  <p>And when I select the file and choose to see Git -> Diff, it only lets me replace or delete the code in my working copy with the code from the HEAD, rather than replace the code in the HEAD. </p>
  
  <p>Basically, I want to commit my code, not revert, etc. How do I do this in netbeans? It keeps telling me I cannot commit because of conflicts.</p>