Forum OpenACS Development: Re: Because of git, any of you can try the merge. I did, here is my results:

Collapse
2: Re: Because of git, any of you can try the merge. I did, here is my results: (response to 1)
Posted by Jim Lynch on 03/05/15 03:13 AM
Maybe you're afraid to see all the conflicts... I have news: the number of lines containing CONFLICT: 36; the number of those lines that contained .info: 25.

My guess is that to resolve the 25 lines, half hour. Estimated time to resolve the rest: 1 - 2 hours.

Interesting, huh?

-Jim

Collapse
3: Re: Because of git, any of you can try the merge. I did, here is my results: (response to 2)
Posted by Jim Lynch on 03/07/15 01:34 PM
Of course, it's not just because of git you can try the merge and other things under git.... Victor Guerra was the one who started and who found the available programs that could read a CVS repo and make a git repo out of it, and as I understand it he also wrote a script that can run periodically to form the new changes to the repo.

Also as I understand things Gustaf wrote some parts of the installer that uses git instead of CVS to move packages into download areas.

Have there been other contributors who have helped in the process which made git possible?

-Jim