Re: Merge or Cherry-Pick?
Andreas Pakulat <apaku <at> gmx.de>
2011-02-01 00:43:17 GMT
On 31.01.11 16:05:43, Aaron J. Seigo wrote:
> On Monday, January 31, 2011, Thiago Macieira wrote:
> > On Monday, 31 de January de 2011 14:44:38 Aaron J. Seigo wrote:
> > > On Monday, January 31, 2011, Andreas Pakulat wrote:
> > > > 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?
> > >
> > > what i've started doing for bugfixes is to apply the fix to the stable
> > > branch (e.g. 4.6) and then cherry-pick that into master. when i tried to
> > > merge the 4.6 branch into master, i just got a ton of conflicts, so i
> > > stopped trying that :)
> > Because of the cherry-picks.
> this was before i did any cherry-picks myself, but perhaps others had already
> beat me to it. in any case, is there a way to fix it so that the 4.6 branch
> would become mergeable with master, or do we now basically just have to wait
> for a 4.7 branch?
One could do a git merge --ours KDE/4.6 if its certain that all changes
from 4.6 have been cherry-picked into master. That'll do the merge, but
ignore any changes in 4.6 and simply always use the master version of
Having had a quick look at the result of a normal git merge KDE/4.6 into
master, however I think that this is not desirable. Even some .desktop
files seem to need manual merging (or at least another scripty run, I
can see fr-translations in 4.6 that are not in master). Other things may