8 ms·
So then when your upstream repo diverges would you just rebase and manually add in anything you want from the forked development tree on the upstream side? Not
by arthurcolle 5y ago
So then when your upstream repo diverges would you just rebase and manually add in anything you want from the forked development tree on the upstream side?
Not sure what's best practice so... just curious how people have handled this - I usually leave my forks of stuff pretty stale and focus on my own little sub-pieces to achieve what I want but not too much else.
- rad_gruchalski 5y agoI usually have my own branch which can be used to get a diff and maintain the diff on any major code structure change. Most often there is not much hassle but can be annoying.
- dharmab 5y agoYes, we would branch from upstream again and apply the patch set against the new branch. Normally it is trivial but once in a while there are manual changes necessary.
- acidbaseextract 5y agoMaintaining the fork as a stack of patches using something like Stacked Git can make it a little easier than rebasing: https://stacked-git.github.io/ https://stacked-git.github.io/