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 <aha...@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 <e...@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
