ProgramGuru

Capstone: collaborate as a four-developer team

Capstone: collaborate as a four-developer team

Four developers share one private or public repository. Each must learn local Git first, then demonstrate how independent branches become reviewed work in the shared GitHub repository.

What you’ll learn

  • Execute a multi-developer Git/GitHub workflow.
  • Resolve a realistic integration conflict.
  • Explain the full path from local edit to released version.

Four developers, one integration path

  1. Local branches

    A, B, C and D work independently.

    feature branches
  2. Pull requests

    Each change is reviewed and checked.

    shared review boundary
  3. Protected main

    Approved changes merge into one shared history.

    release-ready main
release-ready main

One shared repository, many independent local histories

Developer A initializes or clones the project and creates a baseline. Developers B, C and D clone the same GitHub repository. Each creates a task branch from an updated main, commits locally and pushes only that branch.

Pull requests become the integration boundary. Reviewers inspect changes and CI. When branches overlap, the author updates and resolves conflicts. After approved PRs merge, everyone updates local main before starting new work. A final version tag and GitHub Release mark the completed iteration.

Use one repeatable team loop

Run this in a disposable practice repository unless the lesson explicitly says otherwise.

# Every developer, before starting a new task
git switch main
git pull --ff-only
git switch -c feature/<task>

# Work locally
git add <paths>
git commit -m "Describe the task"
git push -u origin feature/<task>

# Open PR, review, fix, merge
# Then update local main again before the next task

The exact branch naming and merge policy can vary, but every person should be able to explain what exists locally, what exists on GitHub and which operation moves information between them.

Practice: Team collaboration capstone

Your task: Assign four tasks: README update, search feature, validation fix and CI workflow. Each developer creates a branch and PR. Intentionally create one text conflict between two branches and resolve it without deleting either developer's required change.

Common pitfall to avoid

Do not let the demonstration turn into four people committing directly to main. The purpose is to make branching, remote synchronization, review and conflict resolution visible.

Check your understanding

After another developer's PR merges into main, what should you normally do before creating your next feature branch?
Choose one answer. You can try again.

Answer and explanation

Update your local main from the remote, then branch from that current state.

Correct.

Team collaboration capstone: what to remember

Capstone: collaborate as a four-developer team is complete when you can explain the state being changed before you run the command, not merely repeat the syntax.

Read further: official supporting documentation.

Reaching the recap and completing the quizzes are separate milestones.

    Course overview →