mid-cherry-pick-conflict
operation
in-progress cherry-pick with one unresolved conflict in src/utils.ts
Description
A repository mid-cherry-pick, blocked on one unresolved conflict. A commit from `feat/hotfix` is being cherry-picked onto `main` where both branches edited `src/utils.ts` differently after forking from a shared baseline. `CHERRY_PICK_HEAD` is set and the conflicted file has markers in the worktree. Useful for testing: - cherry-pick-specific conflict resolution UI - title-bar "CHERRY-PICKING" indicator - distinguishing cherry-pick state from merge/rebase states - `git cherry-pick --continue` / `--abort` flows
Contracts
- main is checked out
- a cherry-pick is in progress (CHERRY_PICK_HEAD exists)
- src/utils.ts has unresolved conflict markers
- exactly 1 unresolved conflict
Tags
Branches
feat/hotfixmain Use it
import { spinUpScenario } from '@gfargo/git-scenarios'
const repo = await spinUpScenario('mid-cherry-pick-conflict')npx git-scenarios create mid-cherry-pick-conflictimport { describeWithScenario } from '@gfargo/git-scenarios/jest'
describeWithScenario('mid-cherry-pick-conflict', (getRepo) => {
it('should have the expected state', async () => {
const repo = getRepo()
// your assertions here
})
})Commit graph
* 9668eb6 (HEAD -> main) feat: use UTC string for dates
| * 04126d9 (feat/hotfix) fix: use locale string for dates
|/
* ebd06d3 feat: baseline utils
* 1e9b280 chore: initial scaffold