[kepler-dev] the big merge

[David Welker]

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:

> Hi,
>
> 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.
>
> thanks,
> chad
> _______________________________________________
> Kepler-dev mailing list
> Kepler-dev at ecoinformatics.org
> http://mercury.nceas.ucsb.edu/ecoinformatics/mailman/listinfo/kepler-dev