Lukas May 1bc3f85d6a fix: Merge worktree conflict when target branch already checked out ...

Use a temp branch + update-ref to avoid "already checked out" error
when merging into the default branch. Also show actual branch name
in the Merge & Push button instead of "Default".

2026-03-06 10:54:42 +01:00

..

public

feat: Rename application from "Codewalk District" to "Codewalkers"

2026-03-05 12:05:08 +01:00

src

fix: Merge worktree conflict when target branch already checked out

2026-03-06 10:54:42 +01:00

components.json

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

index.html

feat: Rename application from "Codewalk District" to "Codewalkers"

2026-03-05 12:05:08 +01:00

package.json

feat: Implement v2 design system with indigo brand, dark mode, and status tokens

2026-03-03 11:43:09 +01:00

postcss.config.js

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

tailwind.config.ts

fix: Replace Instrument Serif with Playfair Display for display headings

2026-03-04 10:23:26 +01:00

tsconfig.app.json

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

tsconfig.app.tsbuildinfo

refactor: Drive connection status from tRPC subscription state

2026-03-05 15:59:39 +01:00

tsconfig.json

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

vite.config.ts

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00