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".
This commit is contained in:
Lukas May
2026-03-06 10:54:42 +01:00
parent bdc95bcb26
commit 1bc3f85d6a
2 changed files with 16 additions and 4 deletions

View File

@@ -214,7 +214,7 @@ export function InitiativeReview({ initiativeId, onCompleted }: InitiativeReview
) : (
<GitMerge className="h-3.5 w-3.5" />
)}
Merge & Push to Default
Merge & Push to {targetBranch || "default"}
</Button>
</div>
</div>