title: How do I rebase while skipping a particular commit?
body: <p>Is there a way to rebase a branch onto another while skipping a particular (conflicting) commit on the other branch?</p>
  
  <p>For example, I want to rebase <code>mybranch</code> onto <code>master</code>, but master contains a commit that will conflict with the commits in master, so I prefer to undo that commit completely.</p>
  
  <pre><code>-o-o-o-o-o-x-o-o-o-o master
       |
       o-o-o-o mybranch
  </code></pre>
  
  <p>x marks the conflicting commit.</p>