4 ms·
> Most VCSs have a destructive command. And the name tips you off that you're about to do something destructive. Like svn's "revert". On the other hand, 'che
by davidw 17y ago
> Most VCSs have a destructive command.
And the name tips you off that you're about to do something destructive. Like svn's "revert". On the other hand, 'checkout' sounds fairly innocent to me.
> intuitive merge conflict resolution workflow.
IIRC, recent versions of svn walk you through it, asking which one you want to keep or letting you edit the file(s).
I actually use git (the branches are really nice for some things), but I'm considering VC systems for office use, and I'm not quite so sure I'd stick my neck out and recommend git.
- masklinn 17y ago> I actually use git (the branches are really nice for some things) FWIW Mercurial now has git-style branches (called bookmarks, hg's branches are different beasts)