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({
1648	1648	actions={
1649	1649	handoffSummary ? (
1650	1650	<TooltipProvider delay={150} closeDelay={150} timeout={400}>
1651		{checkoutControl}
1652	1651	{handoffSummary.state === "open" && handoffSummary.mergeability === "conflicting"
1653	1652	? resolveConflictsControl
1654	1653	: null}
	1654	{checkoutControl}
1655	1655	</TooltipProvider>
1656	1656	) : undefined
1657	1657	}
...	...	@@ -1864,7 +1864,6 @@ export function PullRequestDetailPanel({
1864	1864	threadRef={null}
1865	1865	/>
1866	1866	) : null}
1867		{checkoutControl}
1868	1867	{/* Said where the Merge button is, because it is the answer to why nobody has
1869	1868	pressed it: the merge is already asked for, and the host is holding it. */}
1870	1869	{autoMergeArmed && primaryAction !== "auto-merge-armed" ? (
...	...	@@ -1997,6 +1996,9 @@ export function PullRequestDetailPanel({
1997	1996	</span>
1998	1997	</Badge>
1999	1998	) : null}
	1999	{/* Keep checkout beside the menu so host actions arriving on its left cannot
	2000	move a different action under the reader's pointer. */}
	2001	{checkoutControl}
2000	2002	<Menu>
2001	2003	<Tooltip>
2002	2004	<TooltipTrigger