Hacker News new | ask | show | jobs
by mk 6337 days ago
Cheat sheets are great and all, but they don't teach you version control. I think that what we have here is a very difficult topic to grasp for most people, and countless cheat sheets don't make people understand them.

For example, look at how they are telling you to resolve conflicts.

5.) Resolve Conflicts (Merge Others’ Changes):

    $svn update
    $svn resolved 
Resolving conflicts is almost never that easy, unless it's some white space. Even then you still want to peruse a diff to see what is going on. I know cheat sheets aren't meant as tutorials, but glossing over important stuff like resolving conflicts doesn't really help anybody.