Return-Path: X-Original-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D4E6DF6C for ; Thu, 9 Aug 2012 01:46:20 +0000 (UTC) Received: (qmail 67798 invoked by uid 500); 9 Aug 2012 01:46:19 -0000 Delivered-To: apmail-incubator-flex-dev-archive@incubator.apache.org Received: (qmail 67766 invoked by uid 500); 9 Aug 2012 01:46:19 -0000 Mailing-List: contact flex-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flex-dev@incubator.apache.org Delivered-To: mailing list flex-dev@incubator.apache.org Received: (qmail 67758 invoked by uid 99); 9 Aug 2012 01:46:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 01:46:19 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of omarg.developer@gmail.com designates 209.85.220.175 as permitted sender) Received: from [209.85.220.175] (HELO mail-vc0-f175.google.com) (209.85.220.175) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 01:46:12 +0000 Received: by vcbfy27 with SMTP id fy27so1370575vcb.6 for ; Wed, 08 Aug 2012 18:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=mmrYqmSJViN/wmYzcJgpPK160Uuprg56fg43DjgUqZQ=; b=e4rMB6rtoyssuml30NAsicQq7TCbzlyKErcvvptbHeiOaOsrXDHnxyzKbZVh8P4M6f L+S5x0l6QL6Xs7XYS+XWsuU6vsHdLsIFg2KMv1KdT2wzZRGakZNLpx6+JacolypQZzwX 67ppY9WpsFZ7cycCjWiSGS2I3aodcVrCINekxEmhyWFX0e1Xa6+b5gTeZ8LozXvlTowI QOFXJsx1n3CPGGjAMqhnP65aR6vA0oKjeIwNAxcpXlcbRllgVETWfMEkBHtP47YQmFjG aChRuTXoqzKc6ovf7C6BiJdnNmfdop/JCA2WoQAsbT8HX8x5JGAWS2KPptmKh92Yqg+8 cwfQ== MIME-Version: 1.0 Received: by 10.52.97.227 with SMTP id ed3mr13556139vdb.103.1344476752227; Wed, 08 Aug 2012 18:45:52 -0700 (PDT) Received: by 10.58.151.161 with HTTP; Wed, 8 Aug 2012 18:45:52 -0700 (PDT) In-Reply-To: References: Date: Wed, 8 Aug 2012 18:45:52 -0700 Message-ID: Subject: Re: SVN and issues with branching / consider how we use SVN going forward From: Omar Gonzalez To: flex-dev@incubator.apache.org Content-Type: multipart/alternative; boundary=20cf307abeed39ae8e04c6cb63ac X-Virus-Checked: Checked by ClamAV on apache.org --20cf307abeed39ae8e04c6cb63ac Content-Type: text/plain; charset=ISO-8859-1 > > t saying it is worth it in order to protect the integrity of trunk. > > If it's possible, yes, I really do think Git would help. The reason is > that dealing with merge issues in Git are infinitely easier and, at least > 95% of the time, keeps us out of the merge-hell that I think Justin > legitimately fears. > > The one nice thing about the release and feature branches is that it > allows people to start working toward future releases and grand visions > while a current release is being stabilized. For example the code many had > in whiteboards that was destined for future releases. > > Mike > > I agree with all of this. I would be completely in favor of making Git the primary SCM for the project, it would really make a lot of these workflows easier to manage amongst so many developers. I also posted about the link Mike shared and that model has worked great for our teams. -omar --20cf307abeed39ae8e04c6cb63ac--