Re: [PHP-DEV] Adopt GitFlow process

2012-03-27 Thread Kris Craig
On Mon, Mar 26, 2012 at 12:03 PM, Alexey Shein wrote: > 26 марта 2012 г. 4:30 пользователь Stas Malyshev > написал: > > Hi! > > > >> Main problem is that our current workflow doesn't allow branch-only > >> changes. I.e. if you make a bugfix and want to stay it in PHP-5.3 only > >> you can't merg

Re: [PHP-DEV] Adopt GitFlow process

2012-03-26 Thread Alexey Shein
26 марта 2012 г. 4:30 пользователь Stas Malyshev написал: > Hi! > >> Main problem is that our current workflow doesn't allow branch-only >> changes. I.e. if you make a bugfix and want to stay it in PHP-5.3 only >> you can't merge 5.3 with 5.4 anymore, otherwise your bugfix will go >> there. > > Wh

Re: [PHP-DEV] Adopt GitFlow process

2012-03-25 Thread Stas Malyshev
Hi! > Main problem is that our current workflow doesn't allow branch-only > changes. I.e. if you make a bugfix and want to stay it in PHP-5.3 only > you can't merge 5.3 with 5.4 anymore, otherwise your bugfix will go > there. Why would you want a bugfix to be in 5.3 but not in 5.4? Can you give a

Re: [PHP-DEV] Adopt GitFlow process

2012-03-25 Thread Alexey Shein
26 марта 2012 г. 2:04 пользователь Stas Malyshev написал: > Hi! > >> There was a discussion recently on IRC that our current git working >> process is not perfect (especially about keeping one branch-only >> bugfixes) so that's a > > One thing with discussions on IRC is that nobody except those pr

Re: [PHP-DEV] Adopt GitFlow process

2012-03-25 Thread Kris Craig
On Sun, Mar 25, 2012 at 2:04 PM, Stas Malyshev wrote: > Hi! > > > There was a discussion recently on IRC that our current git working > > process is not perfect (especially about keeping one branch-only > > bugfixes) so that's a > > One thing with discussions on IRC is that nobody except those pre

Re: [PHP-DEV] Adopt GitFlow process

2012-03-25 Thread Stas Malyshev
Hi! > There was a discussion recently on IRC that our current git working > process is not perfect (especially about keeping one branch-only > bugfixes) so that's a One thing with discussions on IRC is that nobody except those present there can neither participate nor know what was talked about.

[PHP-DEV] Adopt GitFlow process

2012-03-25 Thread Alexey Shein
Hi, internals! There was a discussion recently on IRC that our current git working process is not perfect (especially about keeping one branch-only bugfixes) so that's a suggestion to use (and modify to better suit our needs) nvie's gitflow process and git-flow tool he developed to ease the proces