merge-no-conflict
history
a successful --no-ff merge of feat/x into main, fully committed
Description
A repository with a completed `--no-ff` merge sitting at HEAD. `feat/x` was merged into `main` cleanly (no conflicts), and the merge commit is at the tip. Distinct from a fast-forward merge (no merge commit produced) and from `mid-merge-conflict` (in-progress). Useful for testing: - merge commit rendering (the 2-parent case) - "merged branches" lists - tools that distinguish --no-ff from fast-forward merges - history graph visualization with merge nodes
Contracts
- main has the merge commit at HEAD
- HEAD has 2 parents
- worktree is clean
- main is checked out
- feat/x exists and is merged into main
Tags
Branches
feat/xmain Use it
import { spinUpScenario } from '@gfargo/git-scenarios'
const repo = await spinUpScenario('merge-no-conflict')npx git-scenarios create merge-no-conflictimport { describeWithScenario } from '@gfargo/git-scenarios/jest'
describeWithScenario('merge-no-conflict', (getRepo) => {
it('should have the expected state', async () => {
const repo = getRepo()
// your assertions here
})
})Commit graph
* 34a6587 (HEAD -> main) Merge branch feat/x
|\
| * ad8c9b1 (feat/x) feat: add x
|/
* d37e34b feat: baseline a
* 7520170 chore: initial