Abort a merge or rebase

Abort a merge or rebase 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 started a rebase to tidy commits and now want to abort it — return my branch to exactly how it…
I started a rebase to tidy commits and now want to abort it — return my branch to exactly how it was before I began the rebase, discard any in-progress conflict resolutions, and leave my working tree unchanged if possible. Abort the rebase and confirm the branch pointer matches the pre-rebase commit and that no temporary rebase state remains.

Improve — make it easier to accept

+
Before I abort, surface what aborting will discard and what it will keep. Show which commits from…
Before I abort, surface what aborting will discard and what it will keep. Show which commits from the in-progress rebase are already applied, which conflict resolutions are staged but not committed, and whether aborting will lose any local edits I care about. If abort would lose work, recommend a minimal safe stash or patch sequence instead.

Decide — diagnose the stuck moment

+
I started rebasing feature/cleanup onto develop, encountered conflicts, and have resolved some…

I ran git rebase and hit conflicts; I'm mid-rebase and worried about losing hand-resolved hunks.

I started rebasing feature/cleanup onto develop, encountered conflicts, and have resolved some hunks but not finished. I can't finish this rebase right now and worry that aborting will discard my partially resolved conflict fixes. I don't know whether those fixes are saved in the index or only in working files. What's the safest next step to preserve my work and return to a clean branch state?

Become — change the pattern

+
Team members often begin interactive rebases to tidy history, then abort halfway and re-run later,…

Developers repeatedly start rebases and then abort, losing time.

Team members often begin interactive rebases to tidy history, then abort halfway and re-run later, creating duplicate work and confusion. Where is training or workflow slipping, and what single rule or checklist would reduce aborted rebases and preserve developer time?

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.