Project: A Team Workflow

This project practises the loop professional teams use every day: branch, commit, push, review and merge.

Step 1: Start Clean

Pull the latest main, create a branch and confirm you are on it.

git switch main
git pull
git switch -c feature/contact-page

Step 2: Commit in Steps

Make the change in small commits. Add the page, then the styles, then the link. Each commit should leave the project working.

Step 3: Push and Review

Push the branch, open a pull request, and include a summary and manual test notes. Fix review comments with follow-up commits rather than rewriting shared history.

Step 4: Merge and Clean Up

Once approved, merge on the remote, pull main locally and delete the branch. Confirm the deployed site shows the change.

Practice

1. Write a pull request description for a small feature.
2. Rebase your branch on main before opening the pull request.
3. Delete the local and remote branch after merging.

Hands-on exercise

Run the full workflow in a test repository:
1. Branch from main.
2. Make two focused commits.
3. Push the branch.
4. Merge it back into main.
5. Delete the branch locally and on the remote.
6. Show the final graph.

Recap

A reliable workflow is branch, commit in small steps, push, review, merge and clean up.