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. -- Prasanna.,