On Thu, Dec 6, 2012 at 12:43 PM, Rene Gielen <rgie...@apache.org> wrote:
> great and comprehensive writeup. Which brings me to what is really good > about not being the first time mover - being able to profit from other's > experiences. > > Unfortunately I have not so much more experience with GIT :-| Well, I tried the proposed workflow in another project and it looks good so far. 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 - what about feature branches? Should they all go remote? When are they merged into develop? 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. Thanks for the other links below; I will surely read through them the next days. Surely they will include some wisdom Cheers Christian > A nice glance into some Git-related discussions over at Incubator: > http://markmail.org/message/6f7l3fjksjeem6li > > Wicket has fully moved to Git, we might want to peek a bit: > http://markmail.org/message/5rnmtklofv2w7lsv > http://markmail.org/message/6f7l3fjksjeem6li > https://issues.apache.org/jira/browse/INFRA-4204 > https://wicket.apache.org/contribute/release.html > > Maven obviously had a bit more to plan... > https://cwiki.apache.org/MAVEN/git-migration.html > https://issues.apache.org/jira/browse/INFRA-5266 > > Cloudstack was the prototype project for Git@Apache > https://cwiki.apache.org/CLOUDSTACK/git.html > https://cwiki.apache.org/CLOUDSTACK/working-with-cloudstack-code.html > > - René > > > Am 06.12.12 11:53, schrieb Christian Grobmeier: > > On Thu, Dec 6, 2012 at 11:44 AM, Lukasz Lenart <lukaszlen...@apache.org> > wrote: > >> 2012/12/6 Christian Grobmeier <grobme...@gmail.com>: > >>> Would be glad to look at your repos on github. > >>> > >>> One question: are we going to fix issues in Struts 2.x on SVN or are > >>> we going to have everything on GIT then? > >>> In the git-brnaching-model link I see one development branch. I think > >>> we would need a develop2x, develop3x etc branches, right? > >> > >> I thought to leave S2 on SVN and only support it in case of security > >> fixes and really important (performance) fixes, on Git just have S3 > > > > Works for me. Its much safer until we all have the necessary > > experience and a workflow has become natural. > > > > We can incoperate fixes from S2 (svn) into S3 (git). I once wrote > > something in that direction for Apache Logging: > > http://wiki.apache.org/logging/UsingGitWithLogging > > > > I took changes from GIT and pushed it to SVN > > > > Cheers > > Christian > > > > > >> > >> Regards > >> -- > >> Łukasz > >> + 48 606 323 122 http://www.lenart.org.pl/ > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org > >> For additional commands, e-mail: dev-h...@struts.apache.org > >> > > > > > > > > -- > > http://www.grobmeier.de > > https://www.timeandbill.de > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org > > For additional commands, e-mail: dev-h...@struts.apache.org > > > > -- > René Gielen > http://twitter.com/rgielen > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@struts.apache.org > For additional commands, e-mail: dev-h...@struts.apache.org > > -- http://www.grobmeier.de https://www.timeandbill.de
