Lukas May ebeb538e21 test(08-02): add merge conflict scenario tests ...

- Merge conflict detection with merge:conflicted event
- Conflict appears in queue state as conflicted
- handleConflict creates conflict-resolution task
- Successful merge after separate task without conflict

2026-01-31 09:13:40 +01:00

.planning

docs(08): create phase plan

2026-01-31 09:06:44 +01:00

src

test(08-02): add merge conflict scenario tests

2026-01-31 09:13:40 +01:00

tests/integration

feat(01.1-06): update CLI status command and add integration tests

2026-01-30 14:08:33 +01:00

.gitignore

chore(01-01): initialize TypeScript project with ESM

2026-01-30 13:09:43 +01:00

drizzle.config.ts

feat(02-01): create database connection factory

2026-01-30 14:23:42 +01:00

package-lock.json

feat(03-02): install simple-git and create WorktreeManager adapter with CRUD

2026-01-30 19:27:35 +01:00

package.json

feat(03-02): install simple-git and create WorktreeManager adapter with CRUD

2026-01-30 19:27:35 +01:00

tsconfig.json

chore(01-01): initialize TypeScript project with ESM

2026-01-30 13:09:43 +01:00

vitest.config.ts

chore(01.1-01): install and configure Vitest test framework

2026-01-30 13:53:00 +01:00

Description

No description provided

4.3 MiB

Languages

HTML 52.9%

TypeScript 45.5%

Shell 1.1%

CSS 0.3%

JavaScript 0.2%