Introduction to Version Control (Git)

Active learning works because version control is a hands-on skill. Students need to experience the gap between 'editing a file' and 'creating a reliable snapshot' to truly grasp Git's purpose. These activities turn abstract commands into muscle memory through immediate, iterative practice.

• Grade 11
• Computer Science
• 4 activities
• 20 min–45 min

Learning Objectives

1. Compare the functionality of Git with manual file version tracking methods.
2. Demonstrate the process of staging, committing, and pushing code changes to a remote repository.
3. Analyze common Git commands (commit, push, pull, branch) to explain their distinct roles in a collaborative workflow.
4. Construct a basic Git branching strategy for managing feature development and bug fixes.
5. Evaluate the effectiveness of Git in preventing data loss and facilitating code recovery.

Flipped Classroom

⏱ 30 min·Pairs

Pairs: Git Commit Relay

Pairs start with a shared repository containing starter code. Student A adds a simple function, stages with git add, commits with a message, and pushes. Student B pulls changes, reviews the code, adds another function, and pushes. Pairs alternate for five rounds, discussing changes each time.

Prepare & details

Explain the benefits of using version control systems like Git in team projects.

Facilitation Tip: During Git Commit Relay, have each pair write their commands on sticky notes so you can see their thought process in real time.

Setup: Standard classroom, flexible for group activities during class

Materials: Pre-class content (video/reading with guiding questions), Readiness check or entrance ticket, In-class application activity, Reflection journal

• Understand
• Apply
• Analyze
• Self-Management
• Self-Awareness

Flipped Classroom

⏱ 45 min·Small Groups

Small Groups: Branching Challenge

Small groups fork a class project repo. Each member creates a feature branch, implements one OOP method, commits locally, then pushes and opens a mock pull request. The group merges branches one by one, resolving any conflicts with git merge. Debrief on workflow successes.

Prepare & details

Differentiate between common Git commands like commit, push, and pull.

Facilitation Tip: For Branching Challenge, set a strict 10-minute timer for the merge to force quick decision-making.

Setup: Standard classroom, flexible for group activities during class

Materials: Pre-class content (video/reading with guiding questions), Readiness check or entrance ticket, In-class application activity, Reflection journal

• Understand
• Apply
• Analyze
• Self-Management
• Self-Awareness

Flipped Classroom

⏱ 25 min·Whole Class

Whole Class: Live Repo Setup

Project a terminal on screen to demo git init, add, commit, and remote setup step-by-step. Students follow along on their machines to create personal repos and push to a class server. End with a quick poll on first impressions.

Prepare & details

Construct a workflow for collaborating on a coding project using Git.

Facilitation Tip: In Live Repo Setup, pause after each command to ask, 'What would happen if we skipped this step?' to build conceptual depth.

Setup: Standard classroom, flexible for group activities during class

Materials: Pre-class content (video/reading with guiding questions), Readiness check or entrance ticket, In-class application activity, Reflection journal

• Understand
• Apply
• Analyze
• Self-Management
• Self-Awareness

Flipped Classroom

⏱ 20 min·Individual

Individual: Version History Hunt

Students clone a multi-commit repo with intentional errors. They use git log and git checkout to explore history, revert a bad commit, and create a branch to fix issues. Submit a log of their changes.

Prepare & details

Explain the benefits of using version control systems like Git in team projects.

Setup: Standard classroom, flexible for group activities during class

Materials: Pre-class content (video/reading with guiding questions), Readiness check or entrance ticket, In-class application activity, Reflection journal

• Understand
• Apply
• Analyze
• Self-Management
• Self-Awareness

Teaching This Topic

Teach Git as a habit system, not a toolset. Research shows that spaced repetition of commands in context builds retention better than theory alone. Avoid early lectures on 'how Git works under the hood'—focus first on observable behaviors like checking status and committing intentionally. Model error recovery often, because students will mimic your calm approach to mistakes.

What to Expect

Successful learning looks like students confidently explaining why each command matters, not just reciting them. You will see students checking git status before committing, discussing branch strategies in groups, and troubleshooting errors without frustration. Mastery shows when workflows feel intuitive, not like a checklist.

Watch Out for These Misconceptions

Common Misconception

During Git Commit Relay, watch for students who skip git status and commit immediately after editing.

What to Teach Instead

Pause the relay after the first edit and ask pairs to run git status together. Have them explain what 'staged' means using the output before proceeding.

Common Misconception

During Branching Challenge, watch for students who push branches without pulling first.

What to Teach Instead

After the first merge, ask groups to demonstrate their pull-before-push workflow. If they forget, have them redo the merge while narrating each step aloud.

Common Misconception

During Version History Hunt, watch for students who assume commits auto-save like a word processor.

What to Teach Instead

Have them intentionally lose work, then use git reflog to recover it. Debrief by asking, 'What habit would have prevented this?'

Assessment Ideas

Quick Check

After Git Commit Relay, provide a scenario: 'A teammate added a feature but didn’t push. What three commands should they run next?' Collect responses to check for correct command order and purpose.

Exit Ticket

After Branching Challenge, ask students to write one benefit of branches for teamwork and one situation where they would create a new branch. Review responses to assess understanding of parallel work.

Discussion Prompt

During Live Repo Setup, pose: 'Two developers edit the same line. What Git commands show the conflict, and what does the developer need to do?' Guide the discussion to cover merge tools and communication strategies.

Extensions & Scaffolding

• Challenge students who finish early to create a conflict scenario by editing the same file in two branches, then resolve it using git mergetool.
• For students struggling with staging, provide a side-by-side worksheet that maps file states (untracked, modified, staged) to their git status output.
• Deeper exploration: Have students research .gitignore files and add rules for a personal project, then explain their choices to the class.

Key Vocabulary

Repository (Repo)	A storage location for all files and version history of a project. It can be local on your computer or remote on a server.
Commit	A snapshot of your project's staged changes at a specific point in time. Each commit has a unique identifier and a message describing the changes.
Branch	An independent line of development within a repository. Branches allow developers to work on new features or fixes without affecting the main codebase.
Merge	The process of combining changes from one branch into another. This integrates new code into the main project or another feature branch.
Remote Repository	A version of your project hosted on a server, such as GitHub or GitLab, allowing multiple people to collaborate and providing a backup.