Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cloudstack-dev@incubator.apache.org
Received-SPF: neutral (athena.apache.org: local policy)
Date: Thu, 21 Feb 2013 10:21:56 -0500
From: Chip Childers <chip.childers@sungard.com>
To: "cloudstack-dev@incubator.apache.org"
 <cloudstack-dev@incubator.apache.org>
Subject: Re: Branch Merge Expectations - Draft for Discussion
Message-ID: <20130221152156.GS90611@USLT-205755.sungardas.corp>
References: <20130220220337.GA86300@USLT-205755.sungardas.corp>
 <20130221140621.GA13090@cloud-2.local>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130221140621.GA13090@cloud-2.local>
User-Agent: Mutt/1.5.21 (2010-09-15)

On Thu, Feb 21, 2013 at 07:36:21PM +0530, Prasanna Santhanam wrote:
> On Thu, Feb 21, 2013 at 03:33:37AM +0530, Chip Childers wrote:
> > Hi all,
> > 
> > I spent some time working on a draft of "branch merge expectations" [1],
> > and I'd really like to get feedback on it.
> > 
> > Did I document our consensus on the topic correctly?  Is everyone
> > comfortable with these guidelines?  Did I miss anything?
> > 
> > -chip
> > 
> > [1]
> > https://cwiki.apache.org/confluence/display/CLOUDSTACK/Branch+Merge+Expectations
> 
> May be a word about regularly merging master in to your feature branch
> during its development. Branches shouldn't become silos. Since others
> are developing features in their branches that could possibly affect
> your feature it's better to do this on a regular basis.

Added - Thx.

> 
> -- 
> Prasanna.,
>