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)
Message-ID: <20130322060527.140677lygfyfsqnb@franklin.liquidweb.com>
Date: Fri, 22 Mar 2013 06:05:27 -0400
From: Michael Schmalle <apache@teotigraphix.com>
To: dev@flex.apache.org
Subject: Re: [FalconJx] ok, that was scary
References: 
 <CAJs+wW2+3Wi=uPhsq-bq1iJSwBbgK=m_WkaceoW19NDBo33-Fg@mail.gmail.com><DUB118-DS31B0CE8B7C680EE820D1FB4D40@phx.gbl>
 <CAJs+wW13=n=FG-QEUekfvVKryA_OEVYNWN6=0467c-=FLWs_Dg@mail.gmail.com>
 <DUB118-DS2ED7AAC0AC706F7961410B4D40@phx.gbl>
In-Reply-To: <DUB118-DS2ED7AAC0AC706F7961410B4D40@phx.gbl>
MIME-Version: 1.0
Content-Type: text/plain;
 charset=ISO-8859-1;
 DelSp="Yes";
 format="flowed"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
User-Agent: Dynamic Internet Messaging Program (DIMP) H3 (1.1.8)

I can't quite follow this conversation.

That being said, I switch branches to develop in falcon, pulled the  
changes and everything seems fine on my end. All my projects still  
compile and pass tests.

Finally that little debacle seems to be subsiding. :)

Mike


Quoting Fr�d�ric THOMAS <webdoublefx@hotmail.com>:

> 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
> <webdoublefx@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

-- 
Michael Schmalle - Teoti Graphix, LLC
http://www.teotigraphix.com
http://blog.teotigraphix.com