Mysterious Conflict

2003-08-25 Thread Arachtingi, Mike
Greetings all, I'm perplexed by the report of a conflict in a file. I've checked out my entire tree, sticky on a module tag (build-2_4_0.) When I then query status, it shows that one file (out of about 800 files in 500 folders) is not up-to-date. When I try to update it (keeping the sticky tag)

Re: Mysterious Conflict

2003-08-25 Thread Larry Jones
Arachtingi, Mike writes: > > I've checked out my entire tree, sticky on a module tag (build-2_4_0.) > When I then query status, it shows that one file (out of about 800 files > in 500 folders) is not up-to-date. When I try to update it (keeping the > sticky tag) CVS indicates that a conflict is p