starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-10-15 16:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline conflict count with snapshot timestamp in review panel

Browse Source
This commit is contained in:
Jinjing
2026-06-08 10:29:51 -07:00
parent 3153356d87
commit d129c44c16
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/src/components/editor/ConflictComponents.tsx
+6 -5
View File
@@ -284,13 +284,14 @@ export function ConflictReviewPanel({
</TooltipContent>
</Tooltip>
)}
<div className="min-w-0">
<div className="text-sm font-medium text-foreground">
<div className="flex min-w-0 flex-wrap items-baseline gap-x-1.5">
<span className="text-sm font-medium text-foreground">
{unresolvedCount} unresolved conflict{unresolvedCount === 1 ? '' : 's'}
</div>
<div className="mt-1 text-xs text-muted-foreground">
</span>
<span className="text-muted-foreground/50">·</span>
<span className="text-xs text-muted-foreground">
Snapshot captured at {snapshotTime}.
</div>
</span>
</div>
</div>
<Button type="button" size="sm" variant="outline" onClick={onRefreshSnapshot}>