title: How can I rebase 3 commits with one merge of master into one commit?
body: <p>I always seem to stumble and completely mess up git commits when I run into this scenario. I'm hoping to avoid it this time around. Here is my scenario. I have the following 4 commits in my PR:</p>
  
  <pre><code>Commit 1: Remove unused routes for the projects controller
  Commit 2: Add PR request changes and modify similar_by_tags_route
  Commit 3: Merge Master and resolve git merge conflicts
  Commit 4: Reinsert rubocop disablement for project.rb
  </code></pre>
  
  <p>I need these commits rebased into one commit.  Now I can't just do a <code>rebase -i HEAD~4</code> because of the pesky merge from master. Is there a way where I can simply remove commit 3 and just merge commits 1, 2, and 4? I would really like some help on this because I always seem to make a HUGE mess when it comes to tricky merges like this.</p>