title: Git push after rebase
body: <p>I know this has been asked before but i cant seem to wrap my head around this thing...</p>
  
  <pre><code>git checkout master
  git pull
  git git checkout feature
  git rebase origin/master
  
  then resolve all the problems....
  Try to push - not gonna happen...
  </code></pre>
  
  <p>git is really telling me that after doing a rebase ( dealing with n:ths of conflicts )</p>
  
  <p>i have two options, use <code>--force</code> which seems risky and stupid.</p>
  
  <p>or <code>pull</code> again and deal with the merge conflicts again... and end up in same situation?</p>
  
  <pre><code>error: failed to push some refs to 'ssh://git@git.zzz.com/yyy/xxx.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 have locally: feature branch, master ( up to date )</p>
  
  <p>and remote: featureBranch ( which is ahead now ?! ) and master.</p>
  
  <p>I just want to update my feature branch so it's even close to version on master...
  Why is git like this...</p>
  
  <p>I've read many threads about this, and the only solution seem to be to use <code>--force</code></p>
  
  <p><strong>This dosent seem like an solution at all, for me, for such commonly used tool...</strong></p>