flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Erik de Bruin <e...@ixsoftware.nl>
Subject Re: [FalconJX] git != merge hell... ha!
Date Fri, 19 Apr 2013 15:36:59 GMT
Did a whole bunch of very simple commits (basically: "removed TODO")
and one larger one (implement INamespaceAccessExpressionNode).

Done now, my local develop is now equal to the remote one and I have
no local branches 'outstanding'.

Thing will be a bit quieter from me for the foreseeable future, but if
you need anything from me (or just have a pointed question ;-)), shout
out on the list and I'll respond asap.

EdB



On Fri, Apr 19, 2013 at 4:20 PM, Erik de Bruin <erik@ixsoftware.nl> wrote:
> Well, I just pushed my changes... hope they don't mess up your stuff too badly!
>
> Currently working on some of the TODO tasks, shouldn't be too major.
>
> EdB
>
>
> On Fri, Apr 19, 2013 at 4:11 PM, Alex Harui <aharui@adobe.com> wrote:
>> I already have more changes to push. Must keep customer happy. You don't have to
take any of my code, you just have to make all tests pass.
>>
>>
>>
>>
>> Sent via the PANTECH Discover, an AT&T 4G LTE smartphone.
>>
>> Erik de Bruin <erik@ixsoftware.nl> wrote:
>>
>>
>> Alex,
>>
>> Please hold off from making any more changes to JSFlexJSEmitter... I'm
>> still working on the refactor of emitIdentifier (as I emailed two days
>> ago) and your latest commits are right in hart of that method :-(
>>
>> I'll work you changes into the new logic as best as I can and will
>> make the tests pass. But if someone ever claims that using git will
>> prevent the legendary 'merge hell' that is supposed to be unique to
>> SVN, I'll personally have them fix a few like this.
>>
>> 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



-- 
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

Mime
View raw message