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

Oswald Buddenhagen oswald.buddenhagen at digia.com
Fri Jun 14 13:36:55 CEST 2013


On Thu, Jun 13, 2013 at 04:32:24PM +0000, 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 stable branch, then it will be duplicate when the merge happened between stable and dev next time.
> 
> Is it good practice?
> 
it is very bad practice, and therefore explicitly disapproved of by
http://qt-project.org/wiki/Commit_Policy point 11.

both contributors *and* reviewers are expected to pay attention to the
target branch.




More information about the Development mailing list