Hi,
Thanks guys, actually the release manager will do a sync between `master` and `develop`(duplex merge) when release a new version, so this diff only will occur in the gap between two releases. But... Maybe there is something wrong, I will check it~ Regards, yukon On Thu, Jul 13, 2017 at 10:00 AM, Zhanhui Li <lizhan...@gmail.com> wrote: > Agree, develop and master branches should not split. We need to fix this > issue. > > > 在 2017年7月12日，下午9:23，Roman Shtykh <rsht...@yahoo.com.INVALID> 写道： > > > > Folks, > > Please have a look at https://github.com/apache/incubator-rocketmq/tree/ > develop > > This branch is 82 commits ahead, 74 commits behind master. <-- how can > this happen? considering we had a recent release. > > Do we have the situation Justin described before -- "In project where we > had this split it just ends up being more work, people accidentally check > into the wrong branch and I’ve see a lot of merge issues"? > > > > I'll say it again, but it is very inconvenient to use gitflow model on > github (when on github you normally commit on master branch). > > > > -- Roman > > > > On Friday, March 17, 2017 11:41 AM, Justin Mclean < > jus...@classsoftware.com> wrote: > > > > > > Hi, > > > > I also don't see there's a real need to split master and develop. In > project where we had this split it just ends up being more work, people > accidentally check into the wrong branch and I’ve see a lot of merge issues. > > > > That being said the project is free to select whatever model they want. > > > > Thanks, > > Justin > > > >
