Vibe Coder · Unit 8: Building With Claude Code · Lesson 11 of 15

Plan mode and Git

Engineers: plan before large changes, work on branches, commit often, and let Claude Code handle routine Git for you.

Read the short notes and pictures.Do everything inside a blue frame.

Plan, branch, commit

Claude Code can run Git for you: create branches, stage changes, write commit messages and open pull requests. Combined with plan mode, this gives you a workflow where nothing large happens without a plan and nothing is ever lost.

A 3D scene of coloured blocks and cards. : Plan mode, Then.
Plan mode proposes without changing files.

A working routine

  1. Branch

    One per feature.

  2. Plan

    In plan mode. Edit the plan until it is right.

  3. Build in steps

    Commit after each step that passes the checks.

  4. Open a pull request

    Review the whole diff before merging.

A 3D scene of coloured blocks and cards. A branch per feature: $ git switch -c add-invoices.
One branch per feature keeps main working.

What to keep in your own hands

Force pushes

Do these yourself, deliberately.

Merges to main

After you have read the diff.

History rewrites

Only when you understand exactly what will change.

ActivityBuild stepThe first working version

Ship a feature on a branch

Create a branch, plan your next must-have in plan mode, build it in at least three commits with passing checks, and open a pull request against main.

Done when

Merge it once you have read every line.

Keep these

  • Plan before multi-file changes.
  • Branch per feature, commit small.
  • Read diffs before merging.