ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-26 13:03:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Address code review comments

Browse Source
This commit is contained in:
gsxdsm
2026-02-17 23:04:42 -08:00
parent 43c19c70ca
commit dd4c738e91
43 changed files with 1128 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/ui/src/components/views/board-view/dialogs/merge-rebase-dialog.tsx
View File

@@ -167,10 +167,15 @@ export function MergeRebaseDialog({
}
};
const handleConfirm = () => {
const handleConfirm = async () => {
if (!worktree || !selectedBranch) return;
onConfirm(worktree, selectedBranch, selectedStrategy);
onOpenChange(false);
try {
await onConfirm(worktree, selectedBranch, selectedStrategy);
onOpenChange(false);
} catch (err) {
logger.error('Failed to confirm merge/rebase:', err);
throw err;
}
};
const selectedRemoteData = remotes.find((r) => r.name === selectedRemote);
@@ -347,7 +352,11 @@ export function MergeRebaseDialog({
className="bg-purple-600 hover:bg-purple-700 text-white"
>
<GitMerge className="w-4 h-4 mr-2" />
Merge & Rebase
{selectedStrategy === 'merge'
? 'Merge'
: selectedStrategy === 'rebase'
? 'Rebase'
: 'Merge & Rebase'}
</Button>
</DialogFooter>
</DialogContent>