mid-merge-conflict
operation
in-progress merge with one unresolved conflict in src/widget.ts
Description
A repository mid-merge, blocked on one unresolved conflict. `main` and `feat/x` both edited the same line of `src/widget.ts` after forking from a shared baseline. Running `git merge feat/x` on `main` triggered the conflict; the merge is now sitting uncommitted with conflict markers in the worktree. Useful for testing: - conflicts view rendering + per-file resolve actions - title-bar in-progress-operation indicator - the `coco doctor` / `coco ui` flows when a merge is in flight - the C / Esc guard on the conflicts view
Contracts
- main is checked out
- a merge is in progress (MERGE_HEAD exists)
- src/widget.ts has unresolved conflict markers
- exactly 1 unresolved conflict
Tags
Branches
feat/xmain Use it
import { spinUpScenario } from '@gfargo/git-scenarios'
const repo = await spinUpScenario('mid-merge-conflict')npx git-scenarios create mid-merge-conflictimport { describeWithScenario } from '@gfargo/git-scenarios/jest'
describeWithScenario('mid-merge-conflict', (getRepo) => {
it('should have the expected state', async () => {
const repo = getRepo()
// your assertions here
})
})Commit graph
* a9cd5e1 (HEAD -> main) feat: rename widget on main
| * 4be74e3 (feat/x) feat: rename widget on feat/x
|/
* 43bb961 feat: baseline widget
* f1f1793 chore: initial scaffold