mid-revert-conflict
operation
in-progress revert with one unresolved conflict in src/service.ts
Description
A repository mid-revert, blocked on one unresolved conflict. Three commits build on `src/service.ts` progressively. Reverting the second commit (which added `email` and `listUsers`) conflicts with the third commit (which added `role` and `deleteUser`). `REVERT_HEAD` is set and the conflicted file has markers. Useful for testing: - revert-specific conflict resolution UI - title-bar "REVERTING" indicator - distinguishing revert state from merge/rebase/cherry-pick - `git revert --continue` / `--abort` flows
Contracts
- main is checked out
- a revert is in progress (REVERT_HEAD exists)
- src/service.ts has unresolved conflict markers
- exactly 1 unresolved conflict
Tags
Branches
main Use it
import { spinUpScenario } from '@gfargo/git-scenarios'
const repo = await spinUpScenario('mid-revert-conflict')npx git-scenarios create mid-revert-conflictimport { describeWithScenario } from '@gfargo/git-scenarios/jest'
describeWithScenario('mid-revert-conflict', (getRepo) => {
it('should have the expected state', async () => {
const repo = getRepo()
// your assertions here
})
})Commit graph
* 26066af (HEAD -> main) feat: add role field and deleteUser method
* 16aeb7f feat: add email field and listUsers method
* 44eebf1 feat: add user service