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
Local branches
A, B, C and D work independently.
feature branchesPull requests
Each change is reviewed and checked.
shared review boundaryProtected main
Approved changes merge into one shared history.
release-ready main
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 taskThe 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
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.