git-collaboration-example.md

layout	title
page	Git collaboration example

Setup

• Two local copies of a mythesis repository with a bird data file and a README (one is the student's one is the advisor's)
• Open in side by side terminals

Lesson

• Student starts outline

Thesis outline

1. Collect Data
2. ???
3. Profit

• Add, Commit, Push
• Advisor Pulls updates
• Advisory files in ???
• Student simultaneously fills in ???
• Advisor pushes first
• Student tries to push
• Student pulls
• Student resolves conflict
  • Explain manually
  • Demonstrate using meld