Resolve conflicts: - CLAUDE.md: merge feature-based frontend docs from main with comprehensive architecture docs from HEAD - Makefile: merge .PHONY targets from both branches - settings/page.tsx: keep Context field using main's Label component - auth-context.test.tsx: accept main's deletion (moved to features/auth/) - cmd/daemon/daemon.go: accept HEAD's deletion (moved to internal/daemon/) - daemon/client.go: port requestError type and isWorkspaceNotFoundError from main's old daemon into the new internal/daemon package Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| app | ||
| features | ||
| public | ||
| shared | ||
| test | ||
| next-env.d.ts | ||
| next.config.ts | ||
| package.json | ||
| postcss.config.mjs | ||
| tsconfig.json | ||
| vitest.config.ts | ||