title: Having a fork match the original repo when the original master branch can't be merged in?
body: <p>The related questions that SO offer me only answer simple cases that can be solved with a pull - however, that doesn't work well, as you'll see below.</p>
  
  <p>There's a repository I've forked, with just a <code>master</code> branch, and I've forked it, and I've worked in both my <code>master</code>, and a new branch of my own, <code>rw-style</code>. The owner of the forked repository's committed some of my changes but not others; the black dots on the top right below represent commits from both my <code>master</code> and <code>rw-style</code> branches.</p>
  
  <p><img src="https://i.stack.imgur.com/f3hLs.png" alt="alt text"></p>
  
  <p>I'm aware using the fork queue is not a good idea, so I'm staying away from it. Using <code>git pull</code> does work, but it creates a conflict that I would then need to resolve, and it also results in duplicate history for my <code>master</code> branch, and that doesn't look particularly pretty.</p>
  
  <p>I don't know any other solutions right now, so I'm currently considering just creating a patch from two commits that I haven't yet pushed, deleting my fork, creating it again from the original, and then applying my patches on top of it.</p>
  
  <p>Is that the only solution?</p>