cvs is a pain!
tridge at samba.anu.edu.au
Tue Oct 20 01:56:10 GMT 1998
> what happened to the old versions of cvs??? it did a perfectly good merge
> and now if _any_ file is modified by two people, it marks totally
> independent modifications as "conflicts".
it doesn't do that for me. Are you sure some overlapping formatting
changes weren't made?
> this is stupid, and i have a lot of files to update, and a lot of
> "conflicts" to remove.
then proceed carefully :)
More information about the samba-technical