Cannot solve merge conflict for cell code with notebook (ipynb) in VSCODE

[HoangMinhPhan]

Type: Bug

I use notebook (ipynb) and keep track of version using git. However, when I want to merge a change in a feature branch to my main branch (the change is done in notebook ipynb). The view of merge conflict is in text editor, not in notebook viewer. It is very difficult to read and solve the merge conflict. Furthermore, I cannot open the merge editor in this case.

VS Code version: Code 1.86.2 (903b1e9, 2024-02-13T19:40:56.878Z)
OS version: Windows_NT x64 10.0.19045
Modes:

System Info

Item	Value
CPUs	12th Gen Intel(R) Core(TM) i7-12800H (20 x 2803)
GPU Status	2d_canvas: enabled canvas_oop_rasterization: enabled_on 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_graphite: disabled_off video_decode: enabled video_encode: enabled vulkan: disabled_off webgl: enabled webgl2: enabled webgpu: enabled
Load (avg)	undefined
Memory (System)	31.64GB (17.88GB free)
Process Argv	--crash-reporter-id fdbab940-1ecb-4f29-a04b-3a0da7a9618c
Screen Reader	no
VM	0%

Extensions (17)

Extension	Author (truncated)	Version
copilot	Git	1.166.0
copilot-chat	Git	0.12.2
theme-monokai-pro-vscode	mon	1.2.2
black-formatter	ms-	2024.0.1
debugpy	ms-	2024.0.0
flake8	ms-	2023.10.0
python	ms-	2024.0.1
vscode-pylance	ms-	2024.2.2
jupyter	ms-	2024.1.1
jupyter-keymap	ms-	1.1.2
jupyter-renderers	ms-	1.0.17
vscode-jupyter-cell-tags	ms-	0.1.8
vscode-jupyter-slideshow	ms-	0.1.5
material-icon-theme	PKi	4.34.0
tabnine-vscode	Tab	3.72.0
intellicode-api-usage-examples	Vis	0.2.8
vscodeintellicode	Vis	1.2.30

(1 theme extensions excluded)

A/B Experiments

vsliv368:30146709
vspor879:30202332
vspor708:30202333
vspor363:30204092
vscod805:30301674
binariesv615:30325510
vsaa593cf:30376535
py29gd2263:30899288
c4g48928:30535728
azure-dev_surveyone:30548225
962ge761:30959799
pythongtdpath:30769146
welcomedialog:30910333
pythonidxpt:30866567
pythonnoceb:30805159
asynctok:30898717
pythontestfixt:30902429
pythonregdiag2:30936856
pyreplss1:30897532
pythonmypyd1:30879173
pythoncet0:30885854
h48ei257:30968133
pythontbext0:30879054
accentitlementst:30887150
dsvsc016:30899300
dsvsc017:30899301
dsvsc018:30899302
d34g3935:30971562
edj9j583:30969295

[HoangMinhPhan]

Below is two pictures for illustration, when I try to open notebook (ipynb) to solve merge between branches.
This picture is a view in a tab of source control

This picture is a view in a tab of Explorer

[vscodenpa]

This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our documentation.

Happy Coding!

[DonJayamanne]

I cannot open the merge editor in this case.

Fixed here #160941

[DonJayamanne]

Given this issue has only received just 1 upvote since this issue was created and the fact that we now have a way to open the diff editor to resolve merge conflicts, i'm closing this as done.
At the moment, resolving merge conflicts for Notebooks directly in notebook diff editor is not planned.