Why Teams Need Rules

What happens when two people change the same file?

Live Demo

Watch: two developers edit the same code at the same time...

This Is Why We Learned

• Prompt skills — communicate what you're building
• Separation of concerns — work on different files
• Save points + tests — verify combined code works

Git Branches

Your own workspace inside the project.

Parallel Universes

• Each branch is a separate version of the project
• You can make changes without affecting anyone else
• When you're done, you merge your universe back in

Key Commands

# Create a new branch and switch to it
git checkout -b add-new-questions

# See all branches
git branch

# Switch between branches
git checkout main
git checkout add-new-questions
					

Try It!

Create a branch for your feature:

git checkout -b my-feature-name
					

Form Teams

Teams of 2-3. Each person owns one area.

Divide by Concern

• Person A: New questions (questions.js)
• Person B: Visual redesign (styles.css, index.html)
• Person C: New feature (script.js)

Each person works on different files.

Clone the Shared Repo

git clone [your-team-repo-url]
cd [repo-name]
git checkout -b my-feature
					

Break

Stretch, grab water, and plan your feature with your team.

Think About...

What's the hardest part about working on a team project?

Build on Your Branch

Use everything you've learned:

1. Good prompts (Workshop 1)
2. Change only your concern (Workshop 2)
3. Save points and test cases (Workshop 3)

Pull Requests

Propose your changes to the team.

Push Your Branch

git push -u origin my-feature
					

Then open a Pull Request on GitHub.

Write a Good PR Description

• What did you change?
• Why?
• How can your teammate test it?

Ask Copilot to help write the description!

Review a Teammate's PR

• Read the code changes
• Leave a constructive comment
• "This works! One suggestion: ..."
• Approve when you're satisfied

Merge and Resolve

Combine everyone's work.

Merge One PR at a Time

1. Merge the first PR into main
2. Pull the latest: git pull
3. Merge the next PR
4. If there's a conflict — we'll resolve it together

Merge Conflicts

• Conflicts happen when two people changed the same lines
• Git marks exactly what's different
• You decide which version to keep (or combine both)
• Then commit the resolution

After All Merges

1. Pull the latest main
2. Run your test cases
3. Use Playwright to verify it all works
4. Celebrate!

Series Wrap-Up

Your Journey

1. Learned to talk to AI clearly
2. Organized code so each part has one job
3. Saved progress and tested before changing
4. Built as a team without breaking each other's work

Your Toolkit

• Prompt Evaluation Checklist
• Change One Thing reference
• Save Point Loop
• Branch → PR → Review → Merge workflow

Apply these to any project.

Keep Exploring

• Build your own project from scratch
• Try Claude Code as another AI tool
• Explore Godot MCP for game development
• Contribute to each other's projects