Team Up

AI Builder Series — Workshop 4

 

 

 

 

by Brendon Thiede

The Full Journey

  1. Prompt Power-Ups ✓
  2. One Thing at a Time ✓
  3. Save Points ✓
  4. Team Up (today!)

Student Goals

  • Fork a shared team repo
  • Create a branch for feature work
  • Open a pull request on GitHub
  • Review a teammate's code
  • Merge and resolve conflicts

Get Set Up

  1. Open the team repo:
    github.com/Lansing-Tech-Studio/team-quiz-app
  2. Fork it — just like Workshop 1
  3. On your fork: Code → Codespaces → Create codespace on main

Your old quiz-game fork is still yours — today we all build on the team's app.

Why Fork Again?

  • The team repo belongs to everyone — you can't push to it directly
  • Your fork is yours — you can push anything to it
  • Your work reaches the team through a pull request

This is exactly how open-source teams work.

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!

In your fork's Codespace terminal:


git checkout -b test-branch
git branch
git checkout main

We'll create your real feature branch after we form teams.

Form Teams

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

Divide by Concern

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

Each person works on different files.

Create Your Feature Branch

In your fork's Codespace terminal:


git checkout main
git checkout -b my-feature-name

Name the branch after your feature, like add-space-questions or dark-theme.

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-name

This pushes to your fork — that's why it works without special permissions.

Open the Pull Request

  1. GitHub shows a Compare & pull request banner on your fork
  2. Check the direction:
    base: Lansing-Tech-Studio/team-quiz-app main  ←  head: your fork, your branch
  3. Click Create pull request

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. Your instructor merges the first approved PR (only they can — it's the team's repo)
  2. Everyone clicks Sync fork on their fork
  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
  • Click Resolve conflicts on your PR
  • You decide which version to keep (or combine both)
  • Then commit the resolution

After All Merges

  1. Sync fork, then in your Codespace: git checkout main and git pull
  2. Verify it all works
    • Run your test cases
    • Check the automated tests
  3. Open the team's live site — your combined work is on the web!
    lansingtechstudio.org/team-quiz-app
  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
  • Fork → 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
Questions?

Thank you!