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 0166610044 for ; Wed, 8 May 2013 01:28:40 +0000 (UTC) Received: (qmail 88231 invoked by uid 500); 8 May 2013 01:28:39 -0000 Delivered-To: apmail-flex-dev-archive@flex.apache.org Received: (qmail 88188 invoked by uid 500); 8 May 2013 01:28:39 -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 88178 invoked by uid 99); 8 May 2013 01:28:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 01:28:39 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE X-Spam-Check-By: apache.org Received-SPF: error (athena.apache.org: local policy) Received: from [203.59.1.220] (HELO icp-osb-irony-out4.external.iinet.net.au) (203.59.1.220) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 01:28:34 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAOioiVF8lSJ3/2dsb2JhbAANQ4M+vw+BHYMTAQEBAwE6RAsLDS4LV4gfEq8KkiQEjwA6FoJeYQOdaYxTgUo X-IronPort-AV: E=Sophos;i="4.87,631,1363104000"; d="scan'208";a="114491142" Received: from unknown (HELO [192.168.0.17]) ([124.149.34.119]) by icp-osb-irony-out4.iinet.net.au with ESMTP; 08 May 2013 09:27:51 +0800 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Apple Message framework v1283) Subject: Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop From: Justin Mclean In-Reply-To: <149F8129B58B2D418508E63117D9C5419BDED30879@nambx05.corp.adobe.com> Date: Wed, 8 May 2013 11:27:49 +1000 Content-Transfer-Encoding: quoted-printable Message-Id: References: <6cd4ad219d6b40968ea579a30bac44e8@git.apache.org> <6c95eab30a9c4df9801b860c31963a3e@git.apache.org> <85E0E68E8961D64E9200C534AC5E1B241DC1260C@RED-INF-EXMB-P1.esri.com> <149F8129B58B2D418508E63117D9C5419BDED30879@nambx05.corp.adobe.com> To: dev@flex.apache.org X-Mailer: Apple Mail (2.1283) X-Virus-Checked: Checked by ClamAV on apache.org Hi, > Merge commits are a normal feature of Git and should not cause any = confusion. They can simply be ignored. There there any case where they would show other changes? ie In the case = of a conflict? If they can be safely ignored can we not have them mailed to the SVN/Git = change list? Thanks, Justin=