Merge a branch into main

Merge a branch into main in Git — with the four heights of help laid out: do it now, make it easier for the next person to accept, work out the right move when you are stuck, and learn the pattern so it stops coming back.

4prompt heights
Open it in the interactive atlas →

The four heights

The same task, four distances: today's deadline, the next reviewer, the stuck moment, the pattern.

Execute — do the immediate task

+
I need the feature branch feature/auth-token merged into main and deployed by Friday. Check the…
I need the feature branch feature/auth-token merged into main and deployed by Friday. Check the branch for any failing tests, confirm the changelog entry and migration script are present, then merge into main with a fast-forward if possible. After merge, run the CI pipeline and notify Priya in QA and Marco in ops with the commit hash and any post-merge steps.

Improve — make it easier to accept

+
Before I merge feature/auth-token into main, make it easy for reviewers to sign off: surface…
Before I merge feature/auth-token into main, make it easy for reviewers to sign off: surface failing tests or flaky tests up top, show the exact migrations and changelog additions, summarize any database changes in one sentence, and flag commits that touch shared libraries so Marco in operations can decide about deployment timing.

Decide — diagnose the stuck moment

+
I just ran the test suite on feature/auth-token and one integration test failed; Priya in QA needs…

I ran the tests and one integration test failed.

I just ran the test suite on feature/auth-token and one integration test failed; Priya in QA needs a stable build by Friday and Marco in ops will only allow the merge if there are no DB migrations missing. I am worried the failure masks a migration issue and I can’t tell if the test is flaky or caused by my changes. What is the likely cause and what’s the safest next step to unblock the merge?

Become — change the pattern

+
Over the last three sprints we’ve had two rollbacks after merging because migrations or changelog…

We keep merging and then rolling back because migrations were incomplete.

Over the last three sprints we’ve had two rollbacks after merging because migrations or changelog entries were missing and ops blocked deployment. I want to stop that pattern. Which pre-merge checks and small team habits (who signs off, where to add a checklist) will most quickly reduce merge rollbacks and save time for Priya in QA and Marco in ops?

Next to this one

Other version control work people do in Git.

Every task here came from the work, not from a feature list — which is why the prompts name what you want done and never the button that does it. The tool changes; the work does not.
Copyright © LLOS.ai · 2026 — original pedagogy, voice, and design — all rights reserved.

The rest of the map

Same library, five ways in.