Re: Re: Fixes in Git (first in stable, then merge to master)

2011-07-23 Thread Martin Gräßlin
On Saturday 23 July 2011 01:42:16 David Jarvie wrote: On Saturday 23 July 2011 00:00:16 Nicolas Alvarez wrote: There is no active policy saying you're supposed to merge. Almost everybody in KDE is still doing cherry-picks. KDevelop is the only KDE project I know that consistently uses

Re: Re: Re: Fixes in Git (first in stable, then merge to master)

2011-07-23 Thread Martin Gräßlin
On Saturday 23 July 2011 19:28:53 Ben Cooksley wrote: During the stable branch freeze before a minor version release (such as currently before the 4.7 release), it isn't possible to commit bug fixes to stable first and then merge to master. Only master can be committed to, so