[Gllug] Mercurial or Subversion for single user?

[Matthew King]

Tethys <sta296 at astradyne.co.uk> writes:

> Matthew King writes:
>
>>Personally I'd go with git though because 1) git is simple, 2) it has a
>>nice name, and 3) it's what I know.
>
> There we disagree. I like git. I use git. But I couldn't come close
> to calling it simple. It's simple until a merge fails due to conflicts.

Perhaps I should have added the caveat that it's simple *for the
specified use case*.

I've had my own merging fun too...

Matthew

-- 
I must take issue with the term "a mere child", for it has been my
invariable experience that the company of a mere child is infinitely
preferable to that of a mere adult.
                                           --  Fran Lebowitz
-- 
Gllug mailing list  -  Gllug at gllug.org.uk
http://lists.gllug.org.uk/mailman/listinfo/gllug