|}avid writes: > > This seems like a pretty major bug and I'm surprised that it isn't documented. > I tried all variants of 1-10 to no avail. Has anyone else seen this before? It's been discussed here numerous times. See the Cederqvist manual for 1.10.8 (or the current development version) under "Trouble making a connection to a CVS server". -Larry Jones All girls should be shipped to Pluto--that's what I say. -- Calvin
- Unexpected conflicts in branche merges Sankaranarayanan K V
- Re: Unexpected conflicts in branche merges Donald Sharp
- Re: Unexpected conflicts in branche merges Sankaranarayanan K V
- Re: Unexpected conflicts in branche merg... Donald Sharp
- Re: Unexpected conflicts in branche ... Sankaranarayanan K V
- Re: Unexpected conflicts in branche merg... Michael Bletzinger
- Re: Unexpected conflicts in branche merges David Martin
- Wierd bug in pserver on linux (home dirs pro... |}avid (opeland
- Re: Unexpected conflicts in branche merg... Larry Jones
- Re: Unexpected conflicts in branche merges Sankaranarayanan K V
- RE: Unexpected conflicts in branche merges Cameron, Steve
- RE: Unexpected conflicts in branche merges Cameron, Steve
