[kepler-dev] the big merge
berkley at nceas.ucsb.edu
Thu May 22 15:09:58 PDT 2008
yeah, supposedly. It took me about 8 hours of tinkering to get it all
back together and working. lots o' fun :)
David Welker wrote:
> I was wondering...
> It would be an interesting test to see how much work this merge would
> have been in git.
> Merging is git's specialty, right?
> On May 22, 2008, at 3:07 PM, Chad Berkley wrote:
>> I just did the merge from the 1.0.0 branch back to the head. I did not
>> remove any of the files from the head that we had removed from the
>> branch. I did merge any "positive" changes from the branch back to the
>> head. if you see anything that didn't get merged or isn't working,
>> please let me know.
>> Kepler-dev mailing list
>> Kepler-dev at ecoinformatics.org
More information about the Kepler-dev