You've got a few options Firstly, if the client code branches are used anywhere else (someone else is coding against them) then you should not use rebase. Rebase rewrites the history, including the SHA1s and can cause a lot of grief if other people are relying on the history The first option is to create patches of the feature and apply that on the branches you want the feature in The second is to cherry pick the commits into the branches where you want them The third is to simply merge the changes in, altough this won't work if some of your branches have diverged from master to enable a local feature (e.g. For Windows) I would opt for patch or cherry pick and write a script to enable this process to be automated for the specific branche or groups of branches E. G: apply_patches_for_win windows-feature.
Patch or cherry_pick_for_win commit_SHA1 You could also write a script to rebase the branches, if rebase is still the best option.
You've got a few options. Firstly, if the client code branches are used anywhere else (someone else is coding against them) then you should not use rebase. Rebase rewrites the history, including the SHA1s and can cause a lot of grief if other people are relying on the history.
The first option is to create patches of the feature and apply that on the branches you want the feature in. The second is to cherry pick the commits into the branches where you want them. The third is to simply merge the changes in, altough this won't work if some of your branches have diverged from master to enable a local feature (e.g. For Windows).
I would opt for patch or cherry pick and write a script to enable this process to be automated for the specific branche or groups of branches. E. G: apply_patches_for_win windows-feature.
Patch or cherry_pick_for_win commit_SHA1 You could also write a script to rebase the branches, if rebase is still the best option.
I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.