Version Control & Team Collaboration
A presentation deck for Week 3 that explains how Git tracks change, how GitHub supports collaboration, and how teams work safely together.
- Covers the four Week 3 topics in an expanded slide deck.
- Designed for teaching, revision, and team workflow discussion.
- Use arrow keys, buttons, or slide dots to navigate.
Focus
Week 3 Presentation
Use
Teach this page live or review it before class.
What this week is about
Week 3 is about managing change and coordinating work across a team.
- 3.1 Git Basics
- 3.2 GitHub for Remote Collaboration
- 3.3 Branching and Merging
- 3.4 Team Collaboration Workflow
Focus
Overview
Use
Teach this page live or review it before class.
Git records project history as commits
Git keeps snapshots of progress so changes can be reviewed, compared, and recovered safely.
- The working tree is the editable project copy.
- The staging area prepares selected changes for commit.
- A commit is a named snapshot in the repository history.
Focus
3.1 Git Basics
Use
Teach this page live or review it before class.
Version control reduces risk
A history of changes makes experiments safer and debugging easier.
- You can inspect what changed and when it changed.
- You can return to a known good state if a mistake appears.
- Small commits make the history easier to understand.
Focus
3.1 Why it matters
Use
Teach this page live or review it before class.
GitHub hosts shared work for the team
A remote repository gives everyone a shared place to publish and retrieve changes.
- Push sends local work to the shared repository.
- Pull brings the latest shared changes back to the local machine.
- Pull requests make code review and discussion visible.
Focus
3.2 GitHub
Use
Teach this page live or review it before class.
Remote collaboration is built on review and visibility
Teams use GitHub to discuss changes, track tasks, and approve updates before merge.
- Issues describe work that needs attention.
- Pull requests collect review comments and approvals.
- Shared visibility helps the team stay aligned.
Focus
3.2 Collaboration
Use
Teach this page live or review it before class.
Branches isolate work in progress
A branch lets developers work on a task without disturbing the stable line of development.
- Feature branches are common for new work.
- Bugfix branches are useful for small corrections.
- Short-lived branches are easier to merge.
Focus
3.3 Branching
Use
Teach this page live or review it before class.
Merging combines separate lines of history
A merge brings finished work back into the main branch after review and testing.
- Fast-forward merges keep history simple when possible.
- Merge conflicts happen when changes overlap.
- Teams resolve conflicts by choosing the correct final version.
Focus
3.3 Merging
Use
Teach this page live or review it before class.
Merge conflicts are part of teamwork
Conflicts are a signal that two people changed the same area and the team must decide how to combine them.
- Communicate early to reduce overlapping changes.
- Review branches before they become too different from main.
- Use conflict resolution to keep the final code correct.
Focus
3.3 Conflict handling
Use
Teach this page live or review it before class.
A team workflow keeps collaboration organized
Planning, branching, review, and merge steps help the team work in a predictable way.
- Create a branch for each task.
- Push code and open a pull request for review.
- Test the change before merging it back.
Focus
3.4 Workflow
Use
Teach this page live or review it before class.
Review and testing protect the shared branch
A good workflow checks quality before the code is merged for everyone to use.
- Review for correctness, readability, and style.
- Test the feature in a safe branch before merge.
- Remove old branches after the work is complete.
Focus
3.4 Review
Use
Teach this page live or review it before class.
What students should remember
Week 3 is about recording change and coordinating work without breaking the project.
- Git tracks history locally.
- GitHub supports remote collaboration and review.
- Branching and merging keep work organized.
- A shared workflow makes team development safer.
Focus
Recap
Use
Teach this page live or review it before class.