Commit 7856908b8492b7a5c381aa2d5a5c4d4292eb976b | the-knife

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>

1 files changed, 4 insertions(+), 2 deletions(-)

apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx+4-2

 @@ -1648,10 +1648,10 @@ export function PullRequestDetailPanel({
         actions={
           handoffSummary ? (
             <TooltipProvider delay={150} closeDelay={150} timeout={400}>
-              {checkoutControl}
               {handoffSummary.state === "open" && handoffSummary.mergeability === "conflicting"
                 ? resolveConflictsControl
                 : null}
+              {checkoutControl}
             </TooltipProvider>
           ) : undefined
         }
 @@ -1864,7 +1864,6 @@ export function PullRequestDetailPanel({
                   threadRef={null}
                 />
               ) : null}
-              {checkoutControl}
               {/* Said where the Merge button is, because it is the answer to why nobody has
                   pressed it: the merge is already asked for, and the host is holding it. */}
               {autoMergeArmed && primaryAction !== "auto-merge-armed" ? (
 @@ -1997,6 +1996,9 @@ export function PullRequestDetailPanel({
                   </span>
                 </Badge>
               ) : null}
+              {/* Keep checkout beside the menu so host actions arriving on its left cannot
+                  move a different action under the reader's pointer. */}
+              {checkoutControl}
               <Menu>
                 <Tooltip>
                   <TooltipTrigger