title: Unable to Push Project to Remote NotFastForwarding?
body: <p>I have a project that I haven't been able to push for a while due to an error in my Netbeans version.</p>
  
  <p>As a result, there have been many commits that haven't been able to be applied to the remote server on github. </p>
  
  <p>When I try to push the project I get this error message: <a href="https://i.stack.imgur.com/GxhlH.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/GxhlH.png" alt="Error"></a>, which terminates with the log entry:</p>
  
  <p>Remote Repository Updates
  Branch Update : master
  Old Id        : fcf9817a37a891fe0458ec9ff001c6fbc8538315
  New Id        : 2500a6b6033591739b383de8f6444161521401c6
  Result        : REJECTED_NONFASTFORWARD</p>
  
  <pre><code>Local Repository Updates
  ==[IDE]== 1 Aug 2018, 13:35:39 Pushing - StellarOPUSConverter-master finished.
  ==[IDE]== 1 Aug 2018, 13:41:19 Pushing - StellarOPUSConverter-master
  git branch
  git remote -v
  setting up remote: origin
  git submodule status
  git push https://SarahSzabo@github.com/SarahSzabo/StellarOPUSConverter refs/heads/master:refs/heads/master
  
  Remote Repository Updates
  Branch Update : master
  Old Id        : fcf9817a37a891fe0458ec9ff001c6fbc8538315
  New Id        : 2500a6b6033591739b383de8f6444161521401c6
  Result        : REJECTED_NONFASTFORWARD
  
  Local Repository Updates
  ==[IDE]== 1 Aug 2018, 13:41:43 Pushing - StellarOPUSConverter-master finished.
  </code></pre>
  
  <p>From what I've read about other similar posts on the site, the way how people generally tend to get around this is by first pulling and then pushing the project.</p>
  
  <p>When I try pulling, it says that I have a bunch of conflicts, which I resolve by selecting Accept` on the modifications that are from the most recent commit. When I try to push it though, I get the same error as before I pushed it.</p>
  
  <p>Branch Structure:
  <a href="https://i.stack.imgur.com/nfvIM.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/nfvIM.png" alt="Branch Structure"></a></p>
  
  <p>Video of it here:
  <a href="https://youtu.be/NnBLv-b2ZEk" rel="nofollow noreferrer">https://youtu.be/NnBLv-b2ZEk</a></p>
  
  <p>How can I resolve this issue and update the git repository?</p>