struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Lukasz Lenart <lukaszlen...@apache.org>
Subject Re: Git (Was: Plan for Struts 3)
Date Mon, 17 Dec 2012 15:05:01 GMT
2012/12/6 Christian Grobmeier <grobmeier@gmail.com>:
> There are some minor things I found:
>
> - the develop branch needs to be used in CI. Not a big deal, but somehow we
> need to tell it the CI

Yes, you can - there is option branches to build

> - what about feature branches? Should they all go remote? When are they
> merged into develop?

No, you can push it remote but if it's a small change it can stay
local. You merge them when you finished ;-)

> Example: I make a feature A, on lokal. When done I merge it into develop
> and push it to remote, where everybody can access it.
> Now lets say I develop the internal guice upgrade. Its something many
> people want to do. Git lets me push my feature branch to remote, like:
> *
> http://www.mariopareja.com/blog/archive/2010/01/11/how-to-push-a-new-local-branch-to-a-remote.aspx
>
> - use of git rebase. this is a feature which I really don't like or don't
> understand. For me history is sacred. When I do a feature A, i might have 5
> commits. Now when I am pushing this, there are some people who say: nobody
> is interested in the commit-mess. They say, I should do a rebase, and my 5
> commits become one visible.

You perform those five commits to your feature branch, when you have
done, switch to develop and merge

 git merge --no-ff myfeature


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