mid-rebase-conflict
operation
in-progress rebase with one unresolved conflict in src/config.ts
Description
A repository mid-rebase, blocked on one unresolved conflict. `feat/refactor` is being rebased onto `main` where both branches edited `src/config.ts` after forking from a shared baseline. The rebase paused at the conflicting commit; `.git/rebase-merge/` exists and `REBASE_HEAD` is set. Useful for testing: - rebase-specific conflict resolution UI - title-bar "REBASING" indicator - the difference between merge and rebase conflict states - `git rebase --continue` / `--abort` flows
Contracts
- a rebase is in progress (.git/rebase-merge/ exists)
- REBASE_HEAD is set
- src/config.ts has unresolved conflict markers
- exactly 1 unresolved conflict
Tags
Branches
(no branch, rebasing feat/refactor)feat/refactormain Use it
import { spinUpScenario } from '@gfargo/git-scenarios'
const repo = await spinUpScenario('mid-rebase-conflict')npx git-scenarios create mid-rebase-conflictimport { describeWithScenario } from '@gfargo/git-scenarios/jest'
describeWithScenario('mid-rebase-conflict', (getRepo) => {
it('should have the expected state', async () => {
const repo = getRepo()
// your assertions here
})
})Commit graph
* 36f0bb6 (HEAD, main) feat: switch to production env
| * fb0615b (feat/refactor) refactor: use staging env
|/
* 2de6c56 feat: baseline config
* 8b3fa17 chore: initial scaffold