So, doing your work on a local branch, you would have had always the option
to merge it where you wanted, reverting it and merging it again on another
one, good illustration of what it was possible to do if you would have
followed the git branching model.
Just saying ;-)
-Fred
-----Message d'origine-----
From: Erik de Bruin
Sent: Friday, March 22, 2013 10:19 AM
To: dev@flex.apache.org
Subject: Re: [FalconJx] ok, that was scary
This is correct... Falcon didn't have a develop branch, I only created
that this morning. I then merged (locally) my changes on the 'master
branch' into the develop branch, before pushing those out to the
remote develop branch.
My intention was to leave the master branch untouched (as it was when
it was added to git) and make all changes from now on on the develop
branch, as per Gitflow.
EdB
On Fri, Mar 22, 2013 at 10:16 AM, Frédéric THOMAS
<webdoubl...@hotmail.com> wrote:
Hi Erik,
It looks like you worked on the master and merged on the develop branch.
-Fred
-----Message d'origine----- From: Erik de Bruin Sent: Friday, March 22,
2013
8:14 AM To: dev@flex.apache.org Subject: [FalconJx] ok, that was scary
Hi,
I just pushed my outstanding commits to the 'develop' branch of
Falcon... at least, I think I did. Can someone please verify I did it
correctly?
Thanks,
EdB
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
