@@ -3896,23 +3896,22 @@ function ChatViewContent(props: ChatViewProps) {
38963896 id : `branch-mismatch:${ activeThread ?. id ?? "unknown" } :${ localCheckoutBranchMismatch . threadBranch } :${ localCheckoutBranchMismatch . currentBranch } ` ,
38973897 variant : "warning" ,
38983898 icon : < TriangleAlertIcon /> ,
3899- title : "Branches diverged " ,
3899+ title : "You're on a different branch " ,
39003900 className :
39013901 "text-base sm:text-sm [&>div]:items-start max-sm:[&>div]:flex-wrap max-sm:[&>div>div:last-child]:w-full max-sm:[&>div>div:last-child]:self-start dark:shadow-none" ,
39023902 actionClassName :
39033903 "max-sm:w-full max-sm:border-t max-sm:border-border/60 max-sm:pt-2 max-sm:pl-6 sm:border-l sm:border-border/60 sm:pl-3" ,
39043904 description : (
39053905 < p className = "text-pretty" >
3906- Thread { " " }
3906+ This thread is on { " " }
39073907 < code className = "font-medium text-foreground" >
39083908 { localCheckoutBranchMismatch . threadBranch }
39093909 </ code >
3910- < span aria-hidden = "true" > · </ span >
3911- Checkout{ " " }
3910+ , but you're currently checked out at{ " " }
39123911 < code className = "font-medium text-foreground" >
39133912 { localCheckoutBranchMismatch . currentBranch }
39143913 </ code >
3915- . Sending a message will update the thread branch .
3914+ . Sending a message will update the thread.
39163915 </ p >
39173916 ) ,
39183917 actions : (
@@ -3923,15 +3922,15 @@ function ChatViewContent(props: ChatViewProps) {
39233922 disabled = { isRepairingBranch }
39243923 onClick = { ( ) => void handleUpdateThreadToCheckout ( ) }
39253924 >
3926- { branchRepairAction === "update-thread" ? "Updating ..." : "Update thread" }
3925+ { branchRepairAction === "update-thread" ? "Moving ..." : "Move thread here " }
39273926 </ Button >
39283927 < Button
39293928 size = "xs"
39303929 variant = "ghost"
39313930 disabled = { isRepairingBranch }
39323931 onClick = { ( ) => void handleSwitchCheckoutToThread ( ) }
39333932 >
3934- { branchRepairAction === "switch-checkout" ? "Switching..." : "Switch checkout " }
3933+ { branchRepairAction === "switch-checkout" ? "Switching..." : "Checkout thread branch " }
39353934 </ Button >
39363935 </ >
39373936 ) ,
0 commit comments