Usually there is a tight correlation between such statements and the lack of GIT knowledge. Sort of like the amount of the usage of the word "stupid" in scentances where somebody is talking about Maven ;-)
And while noone will probably want to go back to Ant as soon as he has really understood Maven, you will love GIT as soon as you got the hang of it :-) I can certainly recommend the Video Tutorial "McCullough and Berglund on Mastering Git" to get up to speed with all of the new GIT stuff. Chris ________________________________________ Von: Tom Chiverton <t...@extravision.com> Gesendet: Donnerstag, 10. Juli 2014 11:14 An: dev@flex.apache.org Betreff: Re: Hi, about my "experimental/VF2JS" branch It was so much easier with SVN... Tom On 10/07/14 10:02, Jose Barragan wrote: > Hi Erik, > > Nothing is really wrong there, is just for an philosophical criteria based on > best practices of git. > > Currently, you and rest of apache flex team, maintains your branches updated > using a commit merge node from latest commit on develop, isn’t it?. Well, > this practice cause a big complexity on tree node and a messy traceability of > branch content. > > I was proposing you another way, using a combination of git-rebase and > git-merge operations, in order to use git-rebase onto develop to maintain > your branch updated, and git-merge to apply the complete final change-set on > develop when developing is finished. > > But, as I told you, it was a simple proposal only, and if you don't feel like > to adopt it, just forget it and remove the proposed branch. I did the push to > allow you can see the result of the proposed way vs your currently way at > same time, on commits tree. > > Thanks, > ______________________ > Jose Barragan > Senior Software Engineer > Codeoscopic > +34 912 94 80 80 > http://www.codeoscopic.com > > > On 10 Jul 2014, at 07:29, Erik de Bruin <e...@ixsoftware.nl> wrote: > >> José, >> >> I'm confused. What was I doing wrong that made this necessary? >> >> EdB >> >> >> >> On Thursday, July 10, 2014, Jose Barragan <josebarra...@apache.org> wrote: >> >>> Hi Erik, >>> >>> While I was preparing to reactivate the maven branch of falcon's project, >>> I have taken the opportunity to rebase your new branch "VF2JS", onto the >>> latest develop commit, with the intention that you get the new branch and >>> could continue your develop on it, using “git rebase” to maintain your >>> branch updated until the merge time. If you don’t feel happy with this >>> proposal, feel free to completely remove it, but if you feel confortable >>> with new branch and git practice, we can completely remove the old >>> "current" branch version VS2JS. >>> >>> I was only tried to help, with our git usage on apache flex repositories. >>> >>> Thanks, >>> ______________________ >>> *Jose Barragan* >>> *Senior Software Engineer* >>> *josebarra...@apache.org >>> <javascript:_e(%7B%7D,'cvml','josebarra...@apache.org');>* >>> >> >> -- >> Ix Multimedia Software >> >> Jan Luykenstraat 27 >> 3521 VB Utrecht >> >> T. 06-51952295 >> I. www.ixsoftware.nl > ______________________________________________________________________ > This email has been scanned by the Symantec Email Security.cloud service. > For more information please visit http://www.symanteccloud.com > ______________________________________________________________________ >
