From charlesreid1

Software carpentry steps:

  • why version control
  • the philosophy behind git
  • git config file
  • creating a git repo - git init
  • dot git folder

Question: why the two-stage process?

Start with github

  • creating repos on github
  • collaborating on a repo with folks

Conflicts

  • make 2 changes on side by side machines
  • go thru the process - can't push because you have to pull, can't pull because you have conflicts.


Meld - command line tool