Git

A curated list that will one day soon become git-awesome: Git Resources

Notes on my most common git operations: Git Operations

Using Git to deploy static web content: Git Deployment

Syncing a fork: Git/Sync a Fork

Deleting a remote branch: Git/Delete Remote Branch

Tags: Git/Tags

Submodules: Git/Submodules

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