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
Received on Sat Feb 22 2003 - 07:21:58 MST
This archive was generated by hypermail pre-2.1.9 : Tue Dec 09 2003 - 16:19:17 MST