We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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
Type: Bug
Create a merge conflict in git. Like this: git checkout -b test-branch3 && echo "test branch" >> file.txt && git add . && git commit -m "test branch commit" && git checkout main && echo "main branch" >> file.txt && git add . && git commit -m "main branch commit" && git merge test-branch3
git checkout -b test-branch3 && echo "test branch" >> file.txt && git add . && git commit -m "test branch commit" && git checkout main && echo "main branch" >> file.txt && git add . && git commit -m "main branch commit" && git merge test-branch3
Try to resolve the merge conflict with the VSCode UI.
An error occurs when you press "Complete Merge".
Git: Cannot read properties of undefined (reading success)
Extension version: 1.0.2 VS Code version: Code 1.90.2 (Universal) (5437499feb04f7a586f677b155b039bc2b3669eb, 2024-06-18T22:37:41.291Z) OS version: Darwin arm64 22.6.0 Modes:
vsliv368:30146709 vspor879:30202332 vspor708:30202333 vspor363:30204092 vscod805cf:30301675 binariesv615:30325510 vsaa593:30376534 py29gd2263:31024239 vscaat:30438848 c4g48928:30535728 azure-dev_surveyone:30548225 2i9eh265:30646982 962ge761:30959799 pythongtdpath:30769146 welcomedialog:30910333 pythonnoceb:30805159 asynctok:30898717 pythonregdiag2:30936856 pythonmypyd1:30879173 2e7ec940:31000449 pythontbext0:30879054 accentitlementsc:30995553 dsvsc016:30899300 dsvsc017:30899301 dsvsc018:30899302 cppperfnew:31000557 dsvsc020:30976470 pythonait:31006305 chatpanelc:31048052 dsvsc021:30996838 g316j359:31013175 pythoncenvpt:31062603 a69g1124:31058053 dvdeprecation:31068756 dwnewjupyter:31046869 newcmakeconfigv2:31071590 impr_priority:31094925 0c838689:31092287
The text was updated successfully, but these errors were encountered:
No branches or pull requests
Type: Bug
Create a merge conflict in git. Like this:
git checkout -b test-branch3 && echo "test branch" >> file.txt && git add . && git commit -m "test branch commit" && git checkout main && echo "main branch" >> file.txt && git add . && git commit -m "main branch commit" && git merge test-branch3Try to resolve the merge conflict with the VSCode UI.
An error occurs when you press "Complete Merge".
Extension version: 1.0.2
VS Code version: Code 1.90.2 (Universal) (5437499feb04f7a586f677b155b039bc2b3669eb, 2024-06-18T22:37:41.291Z)
OS version: Darwin arm64 22.6.0
Modes:
System Info
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
webgl: enabled
webgl2: enabled
webgpu: enabled
A/B Experiments
The text was updated successfully, but these errors were encountered: