Re: [Development] Is it good practice to have duplicate commits both in dev and stable branch?

2013-06-13 Thread Thiago Macieira
On quinta-feira, 13 de junho de 2013 16.32.24, Qi Liang wrote: > Hi, all, > > dev is for 5.2, and stable is for 5.1.1 and forward now. A commit has > already been merged in dev branch, I guess it means that we(or someone) > decided to have that feature for 5.2. But now, it was cherry-picked into >

[Development] Is it good practice to have duplicate commits both in dev and stable branch?

2013-06-13 Thread Qi Liang
Hi, all, dev is for 5.2, and stable is for 5.1.1 and forward now. A commit has already been merged in dev branch, I guess it means that we(or someone) decided to have that feature for 5.2. But now, it was cherry-picked into stable branch, then it will be duplicate when the merge happened betwee