Files
Codewalkers/apps/server/git/simple-git-branch-manager.ts
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

5.9 KiB