Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [tycho-dev] almost done with 0.12.0...

You are right that the merge won't work after the point releases. But before that, I think we should take the merge approach. It makes it more obvious that none of the commits in the .x branch are missing in master. 

Only cherry-picking from master in the .x branch does ensures the same thing, but it is just not as obvious (e.g. it wasn't for me :-)


> -----Original Message-----
> From: tycho-dev-bounces@xxxxxxxxxxx [mailto:tycho-dev-bounces@xxxxxxxxxxx]
> On Behalf Of Igor Fedorenko
> Sent: 26 April 2011 16:12
> To: Tycho developers list; Tycho developers list
> Subject: Re: [tycho-dev] almost done with 0.12.0...
> Now I see what you mean... I am not sure this will work if we need to make
> point releases, like we did with 0.11.1. Personally, I cherry-pick changes
> from master to release branch instead of doing merge the other way.
> "Oberlies, Tobias" <tobias.oberlies@xxxxxxx> wrote:
> >Done. Now it is possible to merge changes from the tycho-0.12.x branch
> >into master (if we should need additional changes in the branch).
> >Before, you would get a merge conflict for every file affected by the
> >version update.
> >
> >We should use the same branching strategy for future releases of Tycho.
> >
> >Regards
> >Tobias

Back to the top