Mailing-List: contact deltaspike-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: deltaspike-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of lightguard.jp@gmail.com
 designates 74.125.82.175 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CAGJtJfG2RwfKmCMaF1Wfv9A=haDckx6i9uY2EwdXSY8jbyrY4Q@mail.gmail.com>
References: 
 <CAGJtJfG2m3=ZiFR-dsvghBAgwQtvXvovYOT9H=GnLU6wesmYYA@mail.gmail.com>
 <CAF9TksNst_569z0TM=mFe-qv-ebFzcVAyxBFWuGphUUn=xX_gA@mail.gmail.com>
 <CAOqetn_vw3rSx-RTbgBC4XDiH4CBi_y8xm06WFMLx0TkSU-1kg@mail.gmail.com>
 <CAGJtJfG2RwfKmCMaF1Wfv9A=haDckx6i9uY2EwdXSY8jbyrY4Q@mail.gmail.com>
From: Jason Porter <lightguard.jp@gmail.com>
Date: Tue, 3 Jan 2012 17:05:12 -0700
Message-ID: 
 <CAF9TksNhDRNtGz7LU66EOazdhW=MGtNQ2eRfuq6_7unH51k-9A@mail.gmail.com>
Subject: Re: suggested git workflow/s
To: deltaspike-dev@incubator.apache.org
Content-Type: multipart/alternative; boundary=0016e6dd98f21f8d8904b5a893c1

--0016e6dd98f21f8d8904b5a893c1
Content-Type: text/plain; charset=UTF-8

That's not exactly how it would work though, what we want to avoid is merge
commits, so branches are fine, but they need to be fast forward merges when
you commit your branch back to master. As long as your rebase your branch
onto the latest from master before your merge you'll be fine.

On Tue, Jan 3, 2012 at 16:58, Gerhard Petracek
<gerhard.petracek@gmail.com>wrote:

> the idea/s of this proposal:
> the commit history should be as straight as possible.
> that implies that any branch (besides the master) should be avoided until
> we agreed on it (independent of the type) .
>
> regards,
> gerhard
>
>
>
> 2012/1/4 John D. Ament <john.d.ament@gmail.com>
>
> > As long as it is not required that we have specific named branches and
> > someone else has to push in code, I'm ok with the proposed git flow in
> the
> > wiki.
> >
> > On Tue, Jan 3, 2012 at 4:05 PM, Jason Porter <lightguard.jp@gmail.com
> > >wrote:
> >
> > > Shall we start those discussions now? Might as well.
> > >
> > > On Thu, Dec 29, 2011 at 11:00, Gerhard Petracek
> > > <gerhard.petracek@gmail.com>wrote:
> > >
> > > > hi @ all,
> > > >
> > > > mark added some additional suggestions to the wiki [1].
> > > >
> > > > besides that we have to discuss further topics like:
> > > >  - file encoding
> > > >  - line-endings
> > > >  - usage of special characters
> > > >
> > > > regards,
> > > > gerhard
> > > >
> > > > [1]
> > > >
> > > >
> > >
> >
> https://cwiki.apache.org/confluence/display/DeltaSpike/Suggested+Git+Workflows
> > > >
> > >
> > >
> > >
> > > --
> > > Jason Porter
> > > http://lightguard-jp.blogspot.com
> > > http://twitter.com/lightguardjp
> > >
> > > Software Engineer
> > > Open Source Advocate
> > > Author of Seam Catch - Next Generation Java Exception Handling
> > >
> > > PGP key id: 926CCFF5
> > > PGP key available at: keyserver.net, pgp.mit.edu
> > >
> >
>


-- 
Jason Porter
http://lightguard-jp.blogspot.com
http://twitter.com/lightguardjp

Software Engineer
Open Source Advocate
Author of Seam Catch - Next Generation Java Exception Handling

PGP key id: 926CCFF5
PGP key available at: keyserver.net, pgp.mit.edu

--0016e6dd98f21f8d8904b5a893c1--