Home

Files

• Syllabus

Lectures

• Week 1
  • Disqussed methods of version control
  • Reviewed Delta vs Snapshot histories
• Week 2
  • Reviewed the stage
  • Commands
    • git status
    • git add
    • git commit
    • git diff
• Week 3
  • Review Configuration
    • Commands
      • git config
  • Explore Branching
    • Review Commits
    • Talk about lineage
    • Commands
• Week 5 - No Class
• Week 6
  • In class lab
  • Simple Merge Conflicts
  • Complicated Conflict
• Week 7
  • Reviewed Merge Command
  • Reviewed Complicated Merge
    • Looked at merge strategies
    • Learned about events in merge process
    • Learned how to prevent autocommits
    • Learned how to abort a merge