From: John H. <jd...@gm...> - 2011-10-26 12:49:27
|
On Tue, Oct 25, 2011 at 5:58 PM, Paul Ivanov <piv...@gm...> wrote: > On Tue, Oct 25, 2011 at 3:52 PM, Daniel Hyams <dh...@gm...> wrote: >> For small bugfixes, am I supposed to fork from v1.1.x, or master? > > I say 'master' (Mike's been pushing some things to v1.1.x, but as he > said in a comment to #551, "Pushed to v1.1.x since this is pretty > serious yet simple-to-fix bug -- it should be on the maintenance > branch.") Concurring with everything above, with color. It it's a feature, it should definitely go on master. If it's a serious bug, it should go on maintenance. If it's a minor bugfix, we can exercise discretion: if it's simple put it on maintenance; it it's complex, put it on master. |