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 6464AF3DF for ; Tue, 19 Mar 2013 21:03:08 +0000 (UTC) Received: (qmail 51212 invoked by uid 500); 19 Mar 2013 21:03:07 -0000 Delivered-To: apmail-flex-dev-archive@flex.apache.org Received: (qmail 51172 invoked by uid 500); 19 Mar 2013 21:03:07 -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 51163 invoked by uid 99); 19 Mar 2013 21:03:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Mar 2013 21:03:07 +0000 X-ASF-Spam-Status: No, hits=-1.3 required=5.0 tests=FRT_ADOBE2,RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [198.102.62.103] (HELO esri3.esri.com) (198.102.62.103) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Mar 2013 21:03:01 +0000 Received: from RED-INF-EXCS-P2.esri.com (red-inf-excs-p2.esri.com [10.50.4.59]) by esri3.esri.com (8.11.7p3+Sun/8.11.7) with ESMTP id r2JL2el00600 for ; Tue, 19 Mar 2013 14:02:40 -0700 (PDT) Received: from RED-INF-EXMB-P1.esri.com ([169.254.1.29]) by RED-INF-EXCS-P2.esri.com ([10.50.4.59]) with mapi id 14.02.0328.009; Tue, 19 Mar 2013 14:02:40 -0700 From: Dasa Paddock To: "" Subject: Re: [3/3] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop Thread-Topic: [3/3] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop Thread-Index: AQHOJKBhiS6Gi8PqIEGuG9ulmzh0I5itcUgAgAALIICAAAOeAIAABVkAgAAHTICAAANpgIAABomAgAAKGgCAAAMdgIAAB7wAgAACFYCAAA5gAIAABp0AgAAHEgCAAARzAIAACUiA//+gjaCAAH5HgA== Date: Tue, 19 Mar 2013 21:02:39 +0000 Message-ID: <85E0E68E8961D64E9200C534AC5E1B240EE93B97@RED-INF-EXMB-P1.esri.com> References: <20130319123712.98AD33978E@tyr.zones.apache.org> <5294CF39-2DE4-41E2-9985-78AFADA516C9@classsoftware.com> <96B3F50E088E476691CAD6C92167B885@ixsoftware.nl> <85E0E68E8961D64E9200C534AC5E1B240EE93009@RED-INF-EXMB-P1.esri.com> <85E0E68E8961D64E9200C534AC5E1B240EE9357A@RED-INF-EXMB-P1.esri.com> <149F8129B58B2D418508E63117D9C5419BDE67582D@nambx05.corp.adobe.com> In-Reply-To: <149F8129B58B2D418508E63117D9C5419BDE67582D@nambx05.corp.adobe.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.50.254.250] Content-Type: text/plain; charset="iso-8859-1" Content-ID: <6A3B89783FD2D24BAB35F979A2B755D8@esri.local> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org It partly depends our your personal workflow and the tools that you use. Fo= r example, I work in feature branches and I don't leave un-pushed commits s= itting on my develop branch for long. I also use the SourceTree app which i= s doing a fetch on the remote automatically every 10 minutes and shows you = when you're behind the remote, along with a nice view of the history log sh= owing where your branch is and where the remote branches are. --Dasa On Mar 19, 2013, at 1:35 PM, Gordon Smith wrote: > I find it "interesting" that you apparently can't use Git well without ap= pending all sorts of obscure switches such as --ff-only, --preserve-merges,= and --rebase to your commands. >=20 > - Gordon