Git Teamwork for QA: Branching, Merging & Pull Requests

You know how to commit. Now learn how to work next to eight other people without stepping on anyone's toes — branches, merges, conflicts, and the Pull Request where QA finally gets a seat at the table.

Where This Trail Picks Up

You can already init, add, commit, push and pull. That was Git as a personal notebook. This trail is Git as a team sport.

Real projects don't move in a straight line. Three developers, two testers and a designer are all changing the same repository on the same afternoon. main has to keep working the whole time. The mechanism that makes that possible is the branch — a cheap, disposable, parallel line of history where you can break absolutely anything without consequence.

For a tester that changes the job. You stop asking "can someone deploy this build for me?" and start pulling the developer's branch down yourself, running it, and reporting the result before the Pull Request is even reviewed.

What You'll Learn

Six modules, four lessons each:

1. Branching Isolation — why a branch is a tester's safety net, creating and switching with git branch / git switch / git checkout, and always knowing where HEAD is pointing.
2. Merging Mechanics — what git merge really does, the difference between a fast-forward and a merge commit, and how to keep your test branch current with main.
3. Merge Conflicts Handling — why conflicts happen, how to read <<<<<<<, ======= and >>>>>>>, and a fixed step-by-step algorithm that ends every conflict calmly.
4. Stashing — the urgent-hotfix interruption, git stash push to pocket unfinished work, and pop / apply / drop to get it back.
5. Inspection & Blame Tools — git blame for line-by-line authorship and the pickaxe searches git log -S and git log -G for finding the commit where a string first appeared.
6. Code Review & PR Workflow for QA — the life cycle of a Pull Request, git fetch to pick up branches without merging them, checking out a developer's branch to test it, and writing feedback that actually gets acted on.

Every lesson ends with a quiz worth 8 XP. Finish a module and its circular badge is yours; finish all six and you earn the Collaboration Cartographer square badge.

Who Is This For?

Manual and automation QA who have completed Git Foundations for QA — or who already commit and push comfortably but have never resolved a merge conflict without a knot in their stomach. No programming required. A terminal and a scratch repository are enough.

How to Get the Most Out of It

Make yourself a throwaway repository and follow along command by command. Deliberately create a conflict. Deliberately lose a stash and find it again. Everything in this trail is reversible in a scratch repo, and nothing here sticks until your fingers have done it once.

By the end, "I'll wait for the build" stops being something you say.