7 ms·
Have you considered just constantly rebasing as you pull? This works well for private forks, but it may also be doable for public forks if you explain what's go
by akkartik 10y ago
Have you considered just constantly rebasing as you pull? This works well for private forks, but it may also be doable for public forks if you explain what's going on in the Readme. Just an idea. I know it goes against everything we learn about Git, but perhaps it's not so bad in this particular situation.
- mikepurvis 10y agoYeah, I mean that's basically what you do, but it becomes a huge pain if you're making more than one contribution upstream. You feature-branch-1, feature-branch-2, and then the upstream master with those two branches merged into it. When you update either one of the two PRs, you need to rewind the upstream master and reapply the two merges onto it. Maybe that doesn't sound so bad, but it feels super awkward to me.
- akkartik 10y agoAh, I see. Makes more sense when I reread it now. I'm just not juggling multiple patches at a time like this, but it's a valid workflow.