title: Git push rejected "non-fast-forward"
body: <p>I am fairly new to <code>git</code>, yet currently using it to manage our code in a team environment. I had some rebasing issues, and I fixed them using:</p>
  <pre><code>git checkout --ours filename.txt
  git add filename.txt
  git rebase --continue
  </code></pre>
  <p>Now I wish to push my changes, and so running the following command:</p>
  <pre><code>$ git push origin feature/my_feature_branch
  </code></pre>
  <p>Gave me the following error:</p>
  <pre><code>To ssh://git@coderepo.com:7999/repo/myproject.git
   ! [rejected]        feature/my_feature_branch -&gt; feature/my_feature_branch (non-fast-forward)
  error: failed to push some refs to 'ssh://git@coderepo.com:7999/repo/myproject.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>What can I do to get rid of this error?</p>
  <p>Note: I am avoiding the use of <code>--force</code> option as much as possible.</p>