title: Git error: ! [rejected] master -> master (non-fast-forward)
body: <p>I was updating my project and when tried to upload it to my repository,got the following error:</p>
  
  <p>Already did </p>
  
  <blockquote>
    <p>git pull --rebase origin master</p>
  </blockquote>
  
  <pre><code>  ! [rejected]        master -&gt; master (non-fast-forward)
  error: failed to push some refs to 'https://*******/production.git'
  hint: Updates were rejected because the tip of your current branch is behind
  hint: its remote counterpart. Integrate the remote changes (e.g.
  hint: 'git pull ...') before pushing again.
  hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  </code></pre>
  
  <p>I need to update my website but not able to do so.</p>
  
  <p>EDIT 1:</p>
  
  <p><code>&gt; git status</code> gives:</p>
  
  <blockquote>
    <p>rebase in progress; onto cda02b2 You are currently rebasing branch
    'master' on 'cda02b2'.   (all conflicts fixed: run "git rebase
    --continue")</p>
    
    <p>nothing to commit, working directory clean</p>
  </blockquote>