Return-Path: 
 <flex-dev-return-10684-apmail-incubator-flex-dev-archive=incubator.apache.org@incubator.apache.org>
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 41A20DF61
	for <apmail-incubator-flex-dev-archive@minotaur.apache.org>;
 Thu,  9 Aug 2012 01:43:24 +0000 (UTC)
Received: (qmail 58993 invoked by uid 500); 9 Aug 2012 01:43:23 -0000
Delivered-To: apmail-incubator-flex-dev-archive@incubator.apache.org
Received: (qmail 58957 invoked by uid 500); 9 Aug 2012 01:43:23 -0000
Mailing-List: contact flex-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:flex-dev-help@incubator.apache.org>
List-Unsubscribe: <mailto:flex-dev-unsubscribe@incubator.apache.org>
List-Post: <mailto:flex-dev@incubator.apache.org>
List-Id: <flex-dev.incubator.apache.org>
Reply-To: flex-dev@incubator.apache.org
Delivered-To: mailing list flex-dev@incubator.apache.org
Received: (qmail 58945 invoked by uid 99); 9 Aug 2012 01:43:23 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 01:43:23 +0000
X-ASF-Spam-Status: No, hits=-0.7 required=5.0
	tests=RCVD_IN_DNSWL_LOW,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (nike.apache.org: domain of justinmclean@gmail.com
 designates 209.85.160.175 as permitted sender)
Received: from [209.85.160.175] (HELO mail-gh0-f175.google.com)
 (209.85.160.175)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 01:43:15 +0000
Received: by ghbz2 with SMTP id z2so1408191ghb.6
        for <flex-dev@incubator.apache.org>;
 Wed, 08 Aug 2012 18:42:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=sender:content-type:mime-version:subject:from:in-reply-to:date
         :content-transfer-encoding:message-id:references:to:x-mailer;
        bh=Je754DyUr/ztvDeIF3siLz4dS0WdiDe4gRmNamVY5DM=;
        b=0uLX1+i+sbvdyV5rD9rKgvtI3Htl46eUXNNkH+PhzQIDbLx6S87hUQtAK21jNzToZJ
         jGZTEcDBU73l5cGINTHgsYAWOovLIqj68Ic3YrR36BgX12QALtMEtdxVqzDdCMOkn3OS
         vW0k76JSXZqqinxWqFKClli9lhRAUq8Ru1vjkD3hvNUxEGsMFnkSY1/unM5zIvBc7pdl
         /NWdXvbv2hSGI5ZRjcJ+b4SrOpxCGIXBCMl61kEmNJQxMQHpn4PXOycOd4SvAiPsyFaL
         m6eMb6PEOrTSC3nTN6vRZxrh1ucniXcVNqpLXVHlCzkTIZDN5hcXz6slksVA8i90USXe
         OHBw==
Received: by 10.66.75.229 with SMTP id f5mr37969982paw.47.1344476574544;
        Wed, 08 Aug 2012 18:42:54 -0700 (PDT)
Received: from [192.168.0.9] (124-149-46-91.dyn.iinet.net.au. [124.149.46.91])
        by mx.google.com with ESMTPS id pz10sm34883pbb.60.2012.08.08.18.42.52
        (version=TLSv1/SSLv3 cipher=OTHER);
        Wed, 08 Aug 2012 18:42:54 -0700 (PDT)
Sender: Justin Mclean <justinmclean@gmail.com>
Content-Type: text/plain; charset=iso-8859-1
Mime-Version: 1.0 (Apple Message framework v1280)
Subject: Re: How to Merge Unstable Branch (was: [POLL] Use Unstable Branch)
From: Justin Mclean <justin@classsoftware.com>
In-Reply-To: 
 <CAEFz_vvfrnbAExe1uR4fq=Sd3hUxt9ktnoHkPsVK7V0-RWqXDA@mail.gmail.com>
Date: Thu, 9 Aug 2012 11:42:48 +1000
Content-Transfer-Encoding: quoted-printable
Message-Id: <6A9E5E04-5F64-45FC-B5DE-D2547B26AAE3@classsoftware.com>
References: <D2F7DB15-6221-49E2-9368-02B0B5CF947B@classsoftware.com>
 <CC483B63.442E4%aharui@adobe.com>
 <CAEFz_vvfrnbAExe1uR4fq=Sd3hUxt9ktnoHkPsVK7V0-RWqXDA@mail.gmail.com>
To: flex-dev@incubator.apache.org
X-Mailer: Apple Mail (2.1280)

Hi,

> This is an example of a good branching model:
> http://nvie.com/posts/a-successful-git-branching-model/

Yep and it uses multiple branches (ie equiv to option 3 in the SVN link =
I posted earlier) not a single branch as suggested we use for Flex.

Justin=