title: Merge after rebasing feature branch in git
body: <p>I rebase my feature branch on origin/develop to be current on the current state of develop.</p>
  
  <pre><code>git checkout feature-X
  git rebase origin/develop
  </code></pre>
  
  <p>But when I do this I have to merge immediately after. This makes things messy.</p>
  
  <p>I thought that the whole idea of rebasing was that you could rewrite history (pretend we're working off the tip of origin/develop) and only have to merge when you want to integrate your changes into origin/develop.</p>
  
  <p>Am I doing something wrong?</p>
  
  <p><strong>Update:</strong> I can't exactly reproduce what I did without lots more git magic but I'm trying to piece together a functioning feature-branch model mostly going off <a href="https://gist.github.com/17twenty/6733076" rel="noreferrer">this gist</a>.</p>
  
  <p>I "git rebase origin/develop" when I'm in my feature branch. That completes but then tells me I have widely diverged from stuff which I then try to fix by doing a push/pull. That creates a merge which I think I don't want.</p>