Command Palette

Search for a command to run...

Hectal
Phase 4Intermediate5 of 9 in Git

Collaboration Workflows

The commands are the easy part — branching strategy, review etiquette, and real conflict resolution are what actually make a team's Git usage work.

Knowing every Git command doesn't automatically make a team's collaboration smooth — that comes down to agreeing on a branching strategy, running pull requests well, resolving conflicts calmly under real time pressure, and automating the checks that catch mistakes before a human has to.

0/4 · 0%
4 topics ~55 min 5 code blocks & diagrams
Start with the first topic
1
4.1

Branching Strategies: Git Flow, GitHub Flow, Trunk-Based

A branching strategy is a team's agreed-upon convention for how branches get created, named, and merged — the commands are identical either way, but the convention is what keeps a team's history coherent instead of chaotic.

13 min 1 diagram practice

2
4.2

Code Review Workflow & Pull Request Etiquette

A pull request is a conversation, not just a diff — small, focused PRs with a clear description get reviewed faster and better than large, unexplained ones, on both sides of the review.

14 min 1 code practice

3
4.3

Resolving Real Merge Conflicts Under Pressure

A genuine multi-file conflict during a time-sensitive merge is where Git skills actually get tested — a calm, systematic process beats panic every time, and knowing the escape hatches removes most of the pressure.

14 min 1 code practice

4
4.4

Git Hooks & Automated Checks

A Git hook is a script that runs automatically at a specific point in Git's workflow — the standard way to enforce a check (formatting, tests, commit message format) before a commit or push ever happens, without relying on anyone remembering to run it manually.

14 min 2 code practice