Type: Bug

It's a UI fault in the merge editor.
I have written the steps to reproduce it and also attached a screen recording for better understanding.

Note: What I mean by 'Complete Merge' button, conflicted code block's widget and conflict actions bar in this issue 👇

Steps:

First things first
i) Need a code base which have conflicts
- You can clone this repository 👉 complete-merge-issue with both main & branch-w-conflict branches and merge branch branch-w-conflict into main to produce merge conflict.
ii) Open the conflicted file in the Merge Editor

And then: (Please watch the video for better understanding)

1. First in the Result tab, place the conflicted code block's widget aligned with 'Complete Merge' button in bottom-right corner in a way that the conflict actions bar is intersecting with the button (as shown in the video below).

2. Accept code from any stream, incoming or current doesn't matter.

3. Now try to hover over same straight horizontal line as conflict actions bar towards the 'Complete Merge' button, You will notice that the cursor does not become a pointer, and you cannot even click the button.

Now, If you reload the window, the issue will be fixed. However, as soon as you select any action from the actions bar, such as 'remove incoming/current', the issue will occur again.

From my understanding, what is happening here is that after we select any action from the actions bar, the actions bar is overlapping the 'Complete Merge' button in the z-index's stacking context.

I have tried to fix this on my local setup, and I believe I have solved the issue.

If the maintainers want, I can raise a PR! ✨

VS Code version: Code 1.78.2 (b3e4e68, 2023-05-10T14:39:26.248Z)
OS version: Windows_NT x64 10.0.19045
Modes:
Sandboxed: Yes

vsliv368cf:30146710
vsreu685:30147344
python383cf:30185419
vspor879:30202332
vspor708:30202333
vspor363:30204092
vslsvsres303:30308271
vserr242:30382549
pythontb:30283811
vsjup518:30340749
pythonptprofiler:30281270
vshan820:30294714
vstes263:30335439
vscoreces:30445986
vscod805:30301674
binariesv615:30325510
bridge0708:30335490
bridge0723:30353136
cmake_vspar411:30581797
vsaa593:30376534
pythonvs932:30410667
cppdebug:30492333
vsclangdf:30486550
c4g48928:30535728
dsvsc012cf:30540253
pynewext54:30695312
azure-dev_surveyone:30548225
vsccc:30610678
2e4cg342:30602488
pyind779:30671433
89544117:30613380
pythonsymbol12:30671437
showlangstatbar:30737416
vsctsb:30748421
pythonms35:30701012
03d35959:30757346
pythonfmttext:30731395
pythoncmvfstrcf:30756944
fixshowwlkth:30730052
showsbindicator:30760979
pythongtdpath:30739704
pythonnosmt12:30757131