Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

open in merge editor prompt appears for notebook cells, but is noop #160910

Closed
amunger opened this issue Sep 14, 2022 · 1 comment · Fixed by #162186
Closed

open in merge editor prompt appears for notebook cells, but is noop #160910

amunger opened this issue Sep 14, 2022 · 1 comment · Fixed by #162186
Assignees
Labels
bug Issue identified by VS Code Team member as probable bug insiders-released Patch has been released in VS Code Insiders merge-editor verified Verification succeeded

Comments

@amunger
Copy link
Contributor

amunger commented Sep 14, 2022

Type: Bug

  1. creat a git conflict in the input for a notebook cell
  2. open the notebook
    🐛 open in merge editor button appears, but doesn't do anything

VS Code version: Code - Insiders 1.72.0-insider (b3546b4, 2022-09-14T09:01:52.580Z)
OS version: Windows_NT x64 10.0.22621
Modes:
Sandboxed: Yes

System Info
Item Value
CPUs Intel(R) Core(TM) i7-1065G7 CPU @ 1.30GHz (8 x 1498)
GPU Status 2d_canvas: enabled
canvas_oop_rasterization: disabled_off
direct_rendering_display_compositor: disabled_off_ok
gpu_compositing: enabled
multiple_raster_threads: enabled_on
opengl: enabled_on
rasterization: enabled
raw_draw: disabled_off_ok
skia_renderer: enabled_on
video_decode: enabled
video_encode: enabled
vulkan: disabled_off
webgl: enabled
webgl2: enabled
webgpu: disabled_off
Load (avg) undefined
Memory (System) 31.59GB (14.83GB free)
Process Argv --crash-reporter-id 1202dc88-403d-4ebc-8393-af3551a8bd5b
Screen Reader no
VM 0%
Extensions (30)
Extension Author (truncated) Version
Bookmarks ale 13.3.1
tsl-problem-matcher amo 0.6.2
wwbd bre 2022.1.0
vscode-eslint dba 2.2.6
python-environment-manager don 1.0.4
gitlens-insiders eam 2022.9.1305
EditorConfig Edi 0.16.4
prettier-vscode esb 9.8.0
copilot Git 1.44.6735
vscode-pull-request-github Git 0.51.2022091309
vscode-test-explorer hbe 2.21.1
svg joc 1.4.19
prettify-json moh 0.0.3
vscode-language-pack-de MS- 1.71.9140925
vscode-dotnet-runtime ms- 1.5.0
python ms- 2022.15.12571012
vscode-pylance ms- 2022.9.10
data-wrangler ms- 0.0.461
jupyter ms- 2022.9.1002591055
jupyter-keymap ms- 1.0.0
jupyter-renderers ms- 1.0.9
remote-containers ms- 0.252.0
remote-ssh ms- 0.87.2022090715
remote-wsl ms- 0.66.3
js-debug-nightly ms- 2022.9.717
remote-explorer ms- 0.1.2022091309
test-adapter-converter ms- 0.1.6
vscode-github-issue-notebooks ms- 0.0.119
vscode-js-profile-flame ms- 1.0.4
vscode-yaml red 1.10.1
A/B Experiments
vsliv695:30137379
vsins829:30139715
vsliv368cf:30146710
vsreu685:30147344
python383cf:30185419
vspor879:30202332
vspor708:30202333
vspor363:30204092
vstes627:30244334
vslsvsres303:30308271
pythonvspyl392:30422396
pythontb:30258533
pythonptprofiler:30281269
vshan820:30294714
pythondataviewer:30285072
vscod805cf:30301675
bridge0708:30335490
bridge0723:30353136
cmake_vspar411cf:30557515
vsaa593cf:30376535
pythonvs932:30404738
cppdebug:30492333
pylanb8912:30522163
vsclangdf:30492506
c4g48928:30535728
dsvsc012:30540252
vsccc:30564266
pyindex848:30566486

@amunger
Copy link
Contributor Author

amunger commented Sep 14, 2022

image

@hediet hediet added bug Issue identified by VS Code Team member as probable bug merge-editor labels Sep 27, 2022
@hediet hediet added this to the September 2022 milestone Sep 27, 2022
jrieken added a commit that referenced this issue Sep 28, 2022
…ngClickMenu`-contribution for notebook code edtors

fixes #160910
@vscodenpa vscodenpa added the unreleased Patch has not yet been released in VS Code Insiders label Sep 28, 2022
jrieken added a commit that referenced this issue Sep 28, 2022
…ngClickMenu`-contribution for notebook code edtors (#162186)

fixes #160910
@vscodenpa vscodenpa added insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Sep 29, 2022
@amunger amunger added the verified Verification succeeded label Sep 29, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Nov 12, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Issue identified by VS Code Team member as probable bug insiders-released Patch has been released in VS Code Insiders merge-editor verified Verification succeeded
Projects
None yet
5 participants