struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Lukasz Lenart <lukaszlen...@apache.org>
Subject Re: Re: Submitting patches
Date Wed, 21 May 2014 11:40:56 GMT
2014-05-21 13:34 GMT+02:00 Christoph Nenning <Christoph.Nenning@lex-com.net>:
> So it is something like "branching model light", or "lightweight branching
> model".
>
> As summary:
>
> - Small changes go into develop (which is majority of commits/pushes)

yes

> - Big changes *might* get their own branch. Especially when it is not
> clear if a change will be published with some releases in between.

yes, especially if there be more than one commit start everything with
new branch

> - Hot fixes (security stuff) need own branches based on latest tag.

yes

> - master is read-only and used to create tags

read-only but not used to create tags, it should represent the latest
released version

> merges:
> - when a hotfix is published it must be first merged to master and tagged,

it is tagged automatically by Maven during performing mvn
release:prepare, yes and then it must be merged back to master (but
version must set to non-SNAPSHOT - a bit complicated)

> it must be merged into develop as well

yes, but from master

> - normal realeases are merged into master and tagged

tagged (the same as above) and merged to master

> - when a feature-branch is finished it is merged into develop

yes

> Or ist that still too complicated?

It's ok for me


Regards
-- 
Ɓukasz
+ 48 606 323 122 http://www.lenart.org.pl/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message