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 <[email protected]>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 <[email protected]> > > > 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 <[email protected] > > >wrote: > > > > > Shall we start those discussions now? Might as well. > > > > > > On Thu, Dec 29, 2011 at 11:00, Gerhard Petracek > > > <[email protected]>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
