Re: [Tikiwiki-devel] Merging branch

[Sylvie G. <sy...@gr...>]

On Sat, 2006-08-05 at 12:43 -0400, Marc Laporte wrote:
> Hi Marc,
> 
> We have a game. When a new developer asks that question, he must learn 
> how to merge :-)
> 
> We don't have a set schedule. But more merging would be welcome. (The 
> longer we wait, the more difficult it gets)
> 
> There is a doc/script somewhere.  Sylvie?
The script is doc/devtools/tikimerge.sh
It is easy - the difficulty usually comes that cvs is not always a good
merger and creates conflicts.

> 
> Thanks!
> 
> M ;-)
> 
> 
> Marc Kalberer wrote:
> 
> >Hi,
> >Curiosity: How often do you merge the diffrent CVS branches ?
> >= I saw a lot of patches for the 1.9, when will them be available in the 
> >head ?
> >++
> >Marc
> >
> >  
> >
>