>>>>> "Greg" == Greg Troxel <gdt_at_ir.bbn.com> writes:

    Greg> It could also be that I'm just stressing it more.

FWIW, although I see conflicts pretty much on a daily basis (in what
is currently a one-server, one-client setup; my fast workstation and
my road warrior are both currently down), I haven't seen a conflict
that occurred _except_ during a CVS update or checkout in a long,
long, time.  I agree that something is wrong when "conflicts" arise in
a one-to-one network, but this fits with your "stressing harder"
hypothesis.

I also agree that something must be done about the repair situation;
it's a sad day when "Windows medicine" (problem? reinstall everything,
you'll only lose a little data) propagates to what is by design a
robust system.

-- 
Institute of Policy and Planning Sciences     http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba                    Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
               Ask not how you can "do" free software business;
              ask what your business can "do for" free software.