Forum OpenACS Development: Re: Merge between two branches

Collapse
Posted by Victor Guerra on
The way to go is
cvs update -j HEAD in the /packages/evaluation/ folder. There cuold be merge conflicts when cvs is merging so pay attention to the log mesages.

Good luck!

Regards,
Victor Guerra.