Merge or Cherry-Pick?

[Arno Rehn]

On Monday 31 January 2011 23:27:15 Thiago Macieira wrote:
> On Monday, 31 de January de 2011 22:58:52 Andreas Pakulat wrote:
> > Hi,
> > 
> > something that hasn't been written down as far as I can see (if I
> > overlooked it, please point me to it) is what the policy on kdelibs is
> > to be now wrt. merging vs. cherry-picking of changes in branches and
> > master?
> 
> Commit to 4.6, merge 4.6 into master.
I guess that won't quite work when there are commits specific to 4.6 in the 
4.6 branch that shouldn't end up in master. And it clutters history with tons 
of merges.
Personally I'd go with 'Commit to master, cherry-pick in 4.6'.
(Feature branches are a different thing).

-- 
Arno Rehn
arno at arnorehn.de