Hi Pierre, If you apply commits selectively, do you handle conflicts manually? It is a pain for us and that is why we are considering git a major tool for doing this!
Taher Alkhateeb ----- Original Message ----- From: "Pierre Smits" <pierre.sm...@gmail.com> To: user@ofbiz.apache.org Sent: Friday, 3 October, 2014 12:34:21 PM Subject: Re: Starting a new Taher, We follow a somewhat similar approach. Though our production environment is primarily based on the 12.x branch, we do follow al commits in trunk and apply a good number of them in our versions ahead of releases. Regards, Pierre Smits *ORRTIZ.COM <http://www.orrtiz.com>* Services & Solutions for Cloud- Based Manufacturing, Professional Services and Retail & Trade http://www.orrtiz.com On Thu, Oct 2, 2014 at 11:14 PM, Taher Alkhateeb <slidingfilame...@gmail.com > wrote: > Hi everyone, > > On the same topic, would it be a bad/good practice to pull on a certain > revision from trunk, stabilize it, ship to customer and do an upgrade once > in like every six months or so? I am considering this model by committing > this certain revision into git and branching out on my own work and then > merge whatever i pull from subversion. This way we can stay bleeding edge > while staying relatively stable. This can also be done in combination with > the ofbiz addon manager which we found to be very handy. > > Any thoughts on that? > > Taher Alkhateeb > On Oct 2, 2014 11:59 PM, "Jacques Le Roux" <jacques.le.r...@les7arts.com> > wrote: > > > I use trunk myself, but like Adrian I'd generally recommend the lastest > > release branch. > > The trunk is really bleeding edge and the only advantage I have using it > > is, since I'm a committer, I can interact with it and add new features I > > use in custom projects more easily. > > Anyway if ever you need a new feature from the trunk it's often easy to > > simply merge it from the trunk... > > > > Jacques > > > > Le 02/10/2014 21:57, Adrian Crum a écrit : > > > >> I recommend always deploying from the latest release branch. Right now > >> that is 13.07. > >> > >> Adrian Crum > >> Sandglass Software > >> www.sandglass-software.com > >> > >> On 10/2/2014 6:50 PM, Forrest Rae wrote: > >> > >>> Hi Everyone, > >>> > >>> With a new deployment, starting from scratch, would you go with 12.04, > >>> wait for 13.07, or just use the trunk? > >>> > >>> -Forrest > >>> > >>> > >> >
