[cgl_discussion] process issues, review of conflict resolution

[John Cherry]

> > 
> > Without commenting on the whole process description, I can say that it
> > seems insane to me to resolve integration conflicts in the main CVS
> > repository.  
> 
> I think you must think I suggested a commit between steps 1
> and 4.  I did not.
> 

I assumed a commit between steps 1 and 4.  Sorry.  We certainly agree on
the intent of your proposed process.

John