Return-Path: X-Original-To: apmail-flex-dev-archive@www.apache.org Delivered-To: apmail-flex-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 72AF410A09 for ; Tue, 16 Apr 2013 06:36:41 +0000 (UTC) Received: (qmail 86981 invoked by uid 500); 16 Apr 2013 06:36:40 -0000 Delivered-To: apmail-flex-dev-archive@flex.apache.org Received: (qmail 86849 invoked by uid 500); 16 Apr 2013 06:36:40 -0000 Mailing-List: contact dev-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list dev@flex.apache.org Received: (qmail 86808 invoked by uid 99); 16 Apr 2013 06:36:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Apr 2013 06:36:39 +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 aharui@adobe.com designates 64.18.1.237 as permitted sender) Received: from [64.18.1.237] (HELO exprod6og121.obsmtp.com) (64.18.1.237) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Apr 2013 06:36:32 +0000 Received: from outbound-smtp-2.corp.adobe.com ([193.104.215.16]) by exprod6ob121.postini.com ([64.18.5.12]) with SMTP ID DSNKUWzxWigs3FX4WUaFhLHsN5oYuAbXXGJs@postini.com; Mon, 15 Apr 2013 23:36:11 PDT Received: from inner-relay-4.eur.adobe.com (inner-relay-4b [10.128.4.237]) by outbound-smtp-2.corp.adobe.com (8.12.10/8.12.10) with ESMTP id r3G6a999023241 for ; Mon, 15 Apr 2013 23:36:09 -0700 (PDT) Received: from nahub01.corp.adobe.com (nahub01.corp.adobe.com [10.8.189.97]) by inner-relay-4.eur.adobe.com (8.12.10/8.12.9) with ESMTP id r3G6ZntO009130 for ; Mon, 15 Apr 2013 23:36:09 -0700 (PDT) Received: from NAMBX02.corp.adobe.com ([10.8.127.96]) by nahub01.corp.adobe.com ([10.8.189.97]) with mapi; Mon, 15 Apr 2013 23:36:08 -0700 From: Alex Harui To: "dev@flex.apache.org" Date: Mon, 15 Apr 2013 23:36:07 -0700 Subject: Re: Merging 4.9.1 release bench into develop Thread-Topic: Merging 4.9.1 release bench into develop Thread-Index: Ac46a4RSX1maIcGySJyCEu1AvUU7WgAASh2r Message-ID: In-Reply-To: <1B1871AA-9ADA-4A6F-9EAE-CDEBAD7D55C1@classsoftware.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-Entourage/13.16.0.130206 acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org >> What was the change to Version.as in the develop branch that conflicted? > Yep. That wasn't a "yep" question. But I think I know the answer: we updated th= e Version.as in the develop branch. Do we need to do that? I think I saw in the git branching model that they change the version in the release branch after creating it (which implies the don't change it in the develop branch)= . Then it won't conflict on merge. --=20 Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui