On Fri, 18 Mar 2011 11:11:52 +0100 Philipp Brüschweiler <[email protected]> wrote: > On Thu, 17 Mar 2011 20:20:07 -0700 > Slava Pestov <[email protected]> wrote: > > Hi Philipp, > > > > I tried to merge your branch but there were a number of conflicts. > > Can you please rebase the code on top of the latest sources and > > push to a new branch? > > > > Slava > > Hi Slava, > > I tried to do that right now, but the problem is that I the > native-image-loader branch by Joe doesn't even merge cleanly with the > latest sources. Joe changed some things in how enums are handled and I > don't feel comfortable resolving these conflicts as I don't know much > about this part of factor. I'll happily try to rebase my code after > the native-image-loader branch has been merged. > > Greetings > Philipp
That was supposed to go to the mailing list. Sorry about the duplicate mail, Slava. Philipp ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ Factor-talk mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/factor-talk
