Mailing-List: contact dev-help@flex.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@flex.apache.org
Received-SPF: pass (athena.apache.org: local policy)
From: Dasa Paddock <dpaddock@esri.com>
To: "<dev@flex.apache.org>" <dev@flex.apache.org>
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
Date: Tue, 19 Mar 2013 19:12:18 +0000
Message-ID: 
 <85E0E68E8961D64E9200C534AC5E1B240EE9357A@RED-INF-EXMB-P1.esri.com>
References: <20130319123712.98AD33978E@tyr.zones.apache.org>
 <5294CF39-2DE4-41E2-9985-78AFADA516C9@classsoftware.com>
 <DUB118-DS179CDA66DD781EFE445DA1B4E90@phx.gbl>
 <DUB118-DS139240BC7432A01D96F105B4E90@phx.gbl>
 <A8BC7215-BFA0-4C97-B1A2-32512A06E95C@classsoftware.com>
 <DUB118-DS24A1156BB4FFFE96FEEAB2B4E90@phx.gbl>
 <C5B8B041-873D-411D-B460-B0C08065C42C@classsoftware.com>
 <DUB118-DS5B229DECD93724D5552BDB4E90@phx.gbl>
 <AF8273B7-D86D-4CC4-9909-C2334BA8F823@classsoftware.com>
 <DUB118-DS3B06655BD29C19885D232B4E90@phx.gbl>
 <DUB118-DS197E59F2824AF207ADAE08B4E90@phx.gbl>
 <EA3966EE3BDB439E920932D62817C0B3@ixsoftware.nl>
 <DUB118-DS8028E69DCD1F64AD61E42B4E90@phx.gbl>
 <96B3F50E088E476691CAD6C92167B885@ixsoftware.nl>
 <85E0E68E8961D64E9200C534AC5E1B240EE93009@RED-INF-EXMB-P1.esri.com>
 <DUB118-DS31520D51810F3CAF1F747B4E90@phx.gbl>
 <DUB118-DS18C9F27E8C4B63EB02CDDEB4E90@phx.gbl>
In-Reply-To: <DUB118-DS18C9F27E8C4B63EB02CDDEB4E90@phx.gbl>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="iso-8859-1"
Content-ID: <FCD825ED6831F045A1C489483FD0705E@esri.local>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Here's one way to avoid having "git pull" create a merge commit on your dev=
elop branch. Checkout your develop branch and then run:

$ git pull --ff-only=20

If this give you an error it means you have commits on your develop branch =
that are ahead of the remote develop branch. So then, run:

$ git rebase --preserve-merges origin/develop

This will rebase your commits on your local develop branch onto the remote =
develop branch. (Use -p for short.)

You could use "git pull --rebase" instead but this does not preserve merge =
commits, which is what I commonly have following the git flow workflow. For=
 more info on this, see:
http://notes.envato.com/developers/rebasing-merge-commits-in-git/

--Dasa

On Mar 19, 2013, at 11:39 AM, Fr=E9d=E9ric THOMAS <webdoublefx@hotmail.com>=
 wrote:

>> This is the best explanation of when to merge vs. rebase that I've seen:
> http://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/
>=20
> Added as comment to the wiki
>=20
> -Fred
> -----Message d'origine----- From: Fr=E9d=E9ric THOMAS
> Sent: Tuesday, March 19, 2013 7:23 PM
> To: dev@flex.apache.org
> Subject: Re: [3/3] git commit: Merge branch 'develop' of https://git-wip-=
us.apache.org/repos/asf/flex-sdk into develop
>=20
> Hi,
>=20
> This document is perfect, the maybe only little point it didn't cover in
> "Keeping the feature branch up to date" is the possibility interactively
> rebase your commit, which allows in case of too much conflicts, to abord =
it,
> reset --hard and pull (fecth/merge).
>=20
> Thanks for sharing,
> -Fred
>=20
> -----Message d'origine----- From: Dasa Paddock
> Sent: Tuesday, March 19, 2013 6:57 PM
> To: <dev@flex.apache.org>
> Subject: Re: [3/3] git commit: Merge branch 'develop' of
> https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
>=20
> This is the best explanation of when to merge vs. rebase that I've seen:
> http://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/
>=20
> There's also now a public beta of SourceTree for Windows available:
> http://blog.sourcetreeapp.com/2013/03/19/introducing-sourcetree-for-windo=
ws-a-free-desktop-client-for-git/
>=20
> In regards to these unwanted merges, I've seen GitHub for Windows do this
> automatically instead of giving an error when you click it's Sync button =
and
> your local develop branch has commits that have not been pushed yet but t=
he
> remote also also has commits that are not yet on the local develop branch=
.
>=20
> --Dasa
>=20
>=20