Serassio Guido wrote: > After the latest astyle changes to HEAD, when I run cvsmerge, I have got > more the 300 conflicts in nt branch !!!
My recommended action until there is time to clear these up is to stop merging from HEAD, and instead focus on splitting things off to be merged into HEAD. Regards Henrik
