Linux
Peter Hosey
boredzo at gmail.com
Wed Oct 1 11:24:22 CDT 2008
On Oct 01, 2008, at 08:38:03, Bill Barry wrote:
> When this happens the easiest thing to do is to go on a case
> sensitive filesystem and manually merge the two files.
Doesn't this only apply when you're using a working copy in the
repository? Otherwise, there shouldn't be a case conflict.
In a server situation where people only push to and pull from the
server's repo, there's no need for a working copy.
More information about the Mercurial
mailing list