title: Correctly rebasing git branch
body: <p>I have a branch history something like the following:</p>
  
  <p>develop --- o ---- o <br/>
     | <br/>
   feature</p>
  
  <p>I wanted to make changes in the feature branch, so I did the following</p>
  
  <pre><code>git checkout develop
  git pull origin develop
  git fetch origin feature:feature
  git rebase develop
  </code></pre>
  
  <p>Then I made my changes in the feature branch.
  Now, I try to push the feature branch and I get </p>
  
  <pre><code>error: failed to push some refs to 'https://github.com/test/test.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.
  </code></pre>
  
  <p>This is probably due to the remote branch not being rebased. What is the correct way to solve this problem? I dont want to use <code>git push -f</code></p>