On 26 Nov 2013, at 14:35, Gary Gregory wrote:
On Tue, Nov 26, 2013 at 3:52 AM, Emmanuel Bourg <ebo...@apache.org>
wrote:
Le 26/11/2013 08:43, Benedikt Ritter a écrit :
I propose [1] as branching model. It looks very complicated at
first, but
I've found it very useful to always have a release ready version of
the
code in master.
[1] http://nvie.com/posts/a-successful-git-branching-model/
It looks complicated indeed. I prefer having the current developments
on
the master branch and create topic branches to experiment with more
involved changes. I don't think we have enough active developers per
component to require a more sophisticated model.
I agree with Emmanuel. Let's keep it simple by not mixing a change in
VCS
and process at the same time. Let's do Git and see how that goes.
I disagree. One of great benefits of Git is its branching power. You can
work
with Git as you did with SVN but this will ultimately lead to problems.
If attracting new committers is one of your goals you need to adapt the
common
way to work with the tool.
This in fact means:
create a master branch which is stable.
create a develop branch which is not so stable.
create feature branches from develop where you work out your changes.
merge back when done.
This all is supported by good clients. In example SourceTreeApp:
http://www.sourcetreeapp.com/
makes this all happen with just one click (its called git flow).
In my opinion:
if we don't adapt the common approach to use git, we should stick with
svn.
Only if use git as git should be used it makes sense to migrate.
If we are not open to learn (or don't have fun doing that or time) then
let's not do that.
Cheers
Christian
Gary
Emmanuel Bourg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org
--
E-Mail: garydgreg...@gmail.com | ggreg...@apache.org
Java Persistence with Hibernate, Second
Edition<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory
---
http://www.grobmeier.de
@grobmeier
GPG: 0xA5CC90DB
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org
