Say I've only made a small change in my fork, but the upstream updates frequently.
The current mergeMethod: rebase puts upstream commits on top of base, causing base to diverge more and more from upstream.
Is there a way to rebase base on top of upstream, so that they only differ in a few commits?
Say I've only made a small change in my fork, but the upstream updates frequently.
The current
mergeMethod: rebaseputsupstreamcommits on top ofbase, causingbaseto diverge more and more fromupstream.Is there a way to rebase
baseon top ofupstream, so that they only differ in a few commits?