Le 22/01/2012 17:56, lkcl luke a écrit : > On Sun, Jan 22, 2012 at 2:00 PM, Pascal Chambon<[email protected]> wrote: >>> ... p.s. thank you. >>> >> You're welcome. >> >> But actually there are some very nasty conflicts around nested tuples >> assignments, and "for" loops... Dan's And Kees' versions of these (+ the >> corresponding unit tests) have different approaches, aggravatated by the >> fact they don't use the same parser exactly. >> So far all merge attempts resulted in hard-to-debug issues (uncaught >> javascript exceptions and the like). > arse. > > can you take portions of it? > > were the commits done in a controlled fashion i.e. fixing specific > issues one-by-one? > > l.
Yep but the interesting part is actually the conflicting one. As every merge conflict, it'll need a good understanding of the working of both evolutions. Regards, Pascal
