git - Maintaining a patch set for different branches -
I am in a position to prepare a series of documentation patch, each of which applies to more than one branch. Uses guit for version control.
Patch must be implemented on the top of these branches because they are.
What is the optimal workflow for implementing the patch of multiple branches with minimal effort?
new reply
you GIT Cherry-Pick & LT; Commit & gt; ; Here it is.
However, you should avoid the cherry-pick when possible, because it creates a duplicate committment, and you would actually like to see them merge. You should try to get the branch workflow that "merges" man gitworkflows from:
Always make your fixes necessary in the oldest supported branch, whose They need them. Then (from time to time) unification of united branches on one another.
This gives a very controlled flow of fixes. If you see that you have applied a fix for example the master who is also required in maintenance, you have to cherry it (git-cherry-pick (1)) downwards This will happen many times and there is nothing to worry about it unless you do it very often.
In your case, you should be able to divide your document updates into several sections, e.g. "Feature a Documentation", each of which will be merged into one or more branches
Old Reply
If you are curious, then look at the history - how it was addressed You can easily write a script to examine the various branches and merge into the appropriate subjects. To get patches from pushing or patched submissions with more than one branch from local repo.
Comments
Post a Comment