Hi everyone, Uploader 2 in trunk now has the changes we were missing from the branch and is fully back in sync. We all learned a few new things about svn merge in the process, which is great.
We can now all happily resume committing changes to Uploader 2 in trunk. Lots of exciting stuff to come! Colin On 11-Nov-08, at 7:00 PM, Colin Clark wrote: > Hi everyone, > > I had a strange feeling of deja vu tonight as I was fixing an Uploader > 2 bug, seemingly for the second time. Looking more closely at it, I > realized that we somehow managed to merge an out-of-date version of > Uploader 2 back into trunk from the FLUID-1083 branch. > > I'm going to work with Eli tomorrow to sort it out, but in the > meantime it would be very helpful if you could avoid any commits to > Uploader 2-specific files. > > Thanks, > > Colin > > --- > Colin Clark > Technical Lead, Fluid Project > Adaptive Technology Resource Centre, University of Toronto > http://fluidproject.org > > _______________________________________________________ > fluid-work mailing list - [email protected] > To unsubscribe, change settings or access archives, > see http://fluidproject.org/mailman/listinfo/fluid-work --- Colin Clark Technical Lead, Fluid Project Adaptive Technology Resource Centre, University of Toronto http://fluidproject.org _______________________________________________________ fluid-work mailing list - [email protected] To unsubscribe, change settings or access archives, see http://fluidproject.org/mailman/listinfo/fluid-work
