[TYPO3-core] [GIT] Best practice with daily tasks

[Steffen Kamper]

Hi,

just found a nice tip which is good if a patch should go to many 
branches. This is the tip and an excerpt from man gitflowworks:

=========================================================================
However, you should avoid cherry-pick when possible, since it creates 
duplicate commits, and you'd really like to see them as merges. You 
should try to adopt a branch workflow that "merges upwards". From man 
gitworkflows:

     Always commit your fixes to the oldest supported branch that 
require them. Then (periodically) merge the integration branches upwards 
into each other.

     This gives a very controlled flow of fixes. If you notice that you 
have applied a fix to e.g. master that is also required in maint, you 
will need to cherry-pick it (using git-cherry-pick(1)) downwards. This 
will happen a few times and is nothing to worry about unless you do it 
very frequently.
==========================================================================

vg Steffen