Re: [Dri-devel] CVS merge problem solved + suggestion for cvs policy

[Ian R. <id...@us...>]

Michel D=C3=A4nzer wrote:
> On Tue, 2003-10-07 at 13:32, Keith Whitwell wrote:
>=20
>>Hmm.  These problems only arise because of the way the merge was done? =
 Why=20
>>not just document the right way to do the merge?
>=20
> I think tagging the branch point is a good idea regardless.

I agree.  Documenting both the right way to do a merge *and* suggesting=20
the extra tag (as a back-up) are good ideas.  It would probably be a=20
good idea to also document *why* these steps are desireable. :)