Hack@Brown git Workshop! Lets learn git! installation Visit the github page. merge conflicts https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/ changed stuff