title: git rejected push non-fast-forward
body: <p>I am quite new to git, and I had been working on a small side project for the last 2 months and had been pushing stuff onto bitbucket with no problems. A couple of days ago, I zipped my project folder (since I had to reinstall my Linux OS) and now unzipped this after my reinstallation of Linux OS.</p>
  
  <p>So, now, I went to my project folder, kept happily working and finally did:</p>
  
  <pre><code>git add -A &amp;&amp; git commit -m "modified code" &amp;&amp; git push origin master
  </code></pre>
  
  <p>..which is what I usually do..</p>
  
  <p>and I get:</p>
  
  <pre><code>To https://johnsproject@bitbucket.org/johnsproject/proj.git
  ! [rejected]        master -&gt; master (non-fast-forward)
  error: failed to push some refs to 'https://johnsproject@bitbucket.org/johnsproject/proj.git'
  hint: Updates were rejected because the tip of your current branch is behind
  hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
  hint: before pushing again.
  hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  </code></pre>
  
  <p>I have had a look at a few SO questions where they suggest the use of a force flag <code>-f</code> - but I am unsure if I should be doing this.</p>
  
  <p>p.s: I am on the master branch - which is the <code>only</code> branch on my repo.</p>
  
  <p>Would really appreciate if anyone could point me in the right direction here.</p>
  
  <p>Thanks.</p>