6 ms·
* "checkout" is a destructive command Most VCSs have a destructive command. If one doesn't expect the destruction from the command, they will no doubt be pertu
by jjames 17y ago
* "checkout" is a destructive command
Most VCSs have a destructive command. If one doesn't expect the destruction from the command, they will no doubt be perturbed.
* You can’t merge upstream changes into your local, uncommitted modifications
Commit.
* Git’s merge conflict resolution workflow is unintuitive
Subjective but I'm curious which VCS has an intuitive merge conflict resolution workflow. I assume this means that without previous experience with the VCS a developer can (immediately?) intuit the workflow.
* Interface for working with the index almost universally confusing
Three switches for a single command. If you want to operate in a business as usual DWIM manner you can just remember --hard.
All that said, I do believe git reuses some commands in a semantically elastic way, sometimes to the confusion of new users.
- 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)