title: What am I doing wrong with my git rebase workflow?
body: <p>My team is moving from a git merge workflow to a rebase workflow, and I'm not understanding what I'm doing wrong.  I'm working largely from <a href="http://www.monarchdigital.com/blog/2013-02-08/merge-commits-and-how-prevent-them-git-rebase" rel="noreferrer">this blog post</a> as a template.  Ultimately, the desire is to be able to submit a github pull request with the commits from my branch that will have no merge conflicts with master.  It'd be great if that pull request could only contain my commits (for code review purposes).</p>
  
  <p>The scenario is as follows:</p>
  
  <ol>
  <li>I create a branch off of master for my feature</li>
  <li>Do some work...</li>
  <li><p>I rebase from master into my local branch with:</p>
  
  <pre><code>git fetch
  git rebase origin/master
  </code></pre></li>
  <li><p>I take care of any merge conflicts, then continue the rebasing with</p>
  
  <pre><code>git mergetool
  git rebase --continue
  </code></pre></li>
  <li><p>Since I'm the only person working on my branch, I want to be able to just push my current state with</p>
  
  <pre><code>git push origin myBranch
  </code></pre></li>
  <li><p>However, when I try to push, I get the following</p>
  
  <pre><code>$ git push origin myBranch 
  To &lt;github address&gt;
   ! [rejected]        myBranch -&gt; myBranch (non-fast-forward)
  error: failed to push some refs to &lt;github address&gt;
  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></li>
  <li>If I try <code>git rebase origin/myBranch</code> I get many conflicts, because the commits that I've pulled from master are complaining about commits that existed in my branch from a previous rebase <strong>(but that I never personally changed)</strong>.</li>
  </ol>