Git
Resources
- Think Like a Git - Free Site
- Git Happens - Free Video
- Try Git - Free codeschool
- Git manual - by GitHub
- Git Real - Codeschool $
How To Fix Merge Conflict
- git mergetool
- (I like opendiff)
- press enter
- Choose whether left, right, both, neither
- Save / Quit (HAS to be quitting the process)
- Edit files if needed (and then git add them)
- git commit -m "Merge it :boom:"