Stacks and InlineCode

This commit is contained in:
Gregory Schier
2026-03-12 19:45:19 -07:00
parent 4d792c7f9f
commit 77ec87ea17
74 changed files with 293 additions and 324 deletions
+3 -3
View File
@@ -1,10 +1,9 @@
import type { DivergedStrategy } from '@yaakapp-internal/git';
import { HStack, InlineCode } from '@yaakapp-internal/ui';
import { useState } from 'react';
import { showDialog } from '../../lib/dialog';
import { InlineCode } from '@yaakapp-internal/ui';
import { Button } from '../core/Button';
import { RadioCards } from '../core/RadioCards';
import { HStack } from '../core/Stacks';
type Resolution = 'force_reset' | 'merge';
@@ -40,7 +39,8 @@ function DivergedDialog({ remote, branch, onResult, onHide }: DivergedDialogProp
Your local branch has diverged from{' '}
<InlineCode>
{remote}/{branch}
</InlineCode>. How would you like to resolve this?
</InlineCode>
. How would you like to resolve this?
</p>
<RadioCards
name="diverged-strategy"