Re: [Development] CI doing merge release->stable->dev

2013-01-22 Thread Frederik Gladhorn
Tirsdag 22. januar 2013 07.14.01 skrev Fält Simo: > Hi, > I've been getting requests from several fronts to make ci to handle merge's > between branches. Having automated merge from dev->stable->release doesn't > make sense. But merging from release->stable->dev might be doable, but > before doing

Re: [Development] CI doing merge release->stable->dev

2013-01-21 Thread Thiago Macieira
On terça-feira, 22 de janeiro de 2013 07.14.01, Fält Simo wrote: > At the moment, automated merge would always face a merge conflict due to > sync.profile pointing to same branch where it currently is. To get this > sorted out, we would have to leave the sync.profile to serve only one > branch and

[Development] CI doing merge release->stable->dev

2013-01-21 Thread Fält Simo
Hi, I've been getting requests from several fronts to make ci to handle merge's between branches. Having automated merge from dev->stable->release doesn't make sense. But merging from release->stable->dev might be doable, but before doing that I would like to hear your input. At the moment, aut