Git control issue

[Mutahharahmad97]

Type: Bug

Conflicts resolving not working

VS Code version: Code 1.84.2 (Universal) (1a5daa3a0231a0fbba4f14db7ec463cf99d7768e, 2023-11-09T10:52:33.687Z) OS version: Darwin arm64 22.5.0 Modes:

System Info

|Item|Value| |---|---| |CPUs|Apple M1 (8 x 24)| |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
video_decode: enabled
video_encode: enabled
vulkan: disabled_off
webgl: enabled
webgl2: enabled
webgpu: enabled| |Load (avg)|3, 7, 6| |Memory (System)|8.00GB (0.08GB free)| |Process Argv|--crash-reporter-id be51b8c3-2ec6-451b-b987-4cb54943acae| |Screen Reader|no| |VM|0%|

Extensions (104)

Extension|Author (truncated)|Version ---|---|--- better-comments|aar|3.0.2 vscode-eclipse-keybindings|alp|0.16.1 vscode-apollo|apo|1.20.0 vscode-django|bat|1.14.0 vscode-node-readme|ben|3.0.2 django-html|bib|1.3.0 django-snippets|bib|1.1.1 django|big|1.0.2 vscode-tailwindcss|bra|0.10.3 simple-react-snippets|bur|1.2.7 npm-intellisense|chr|1.4.5 path-intellisense|chr|2.8.5 vscode-postgres|cko|1.4.3 postcss|css|1.0.9 vscode-eslint|dba|2.4.2 python-environment-manager|don|1.2.4 python-extension-pack|don|1.7.0 xml|Dot|2.5.1 es7-react-js-snippets|dsz|4.4.3 vscode-babel-coloring|dza|0.0.4 gitlens|eam|14.5.2 vscode-html-css|ecm|1.13.1 EditorConfig|Edi|0.16.4 react-native-react-redux|EQu|2.0.6 prettier-vscode|esb|10.1.0 figma-vscode-extension|fig|0.3.0 auto-rename-tag|for|0.1.10 code-runner|for|0.12.1 copilot|Git|1.140.0 copilot-chat|Git|0.10.2 vscode-github-actions|git|0.26.2 vscode-pull-request-github|Git|0.76.1 gc-excelviewer|Gra|4.2.58 vscode-graphql|Gra|0.8.20 vscode-graphql-execution|Gra|0.2.4 vscode-graphql-syntax|Gra|1.2.2 sanity-snippets|hdo|1.0.0 vscode-drawio|hed|1.6.6 svgeditor|hen|2.9.0 emotionsnippets|iJS|1.1.2 svg|joc|1.5.3 styled-components-snippets|jon|0.10.0 vsc-python-indent|Kev|1.18.0 vscode-open-files-in-directory|ko-|1.0.7 next-js-ts-snippets|loc|2.0.3 MagicPython|mag|1.1.0 vscode-language-babel|mgm|0.0.40 prettify-json|moh|0.0.3 vscode-docker|ms-|1.28.0 vscode-dotnet-runtime|ms-|2.0.0 vscode-postgresql|ms-|0.3.0 autopep8|ms-|2023.8.0 isort|ms-|2023.10.1 python|ms-|2023.20.0 vscode-pylance|ms-|2023.11.10 jupyter|ms-|2023.10.1003070148 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 remote-containers|ms-|0.321.0 makefile-tools|ms-|0.7.0 powershell|ms-|2023.8.0 vscode-typescript-next|ms-|5.4.20231206 react-emotion-snippets|msk|1.4.0 autodocstring|njp|0.6.1 material-icon-theme|PKi|4.32.0 vscode-react-refactor|pla|1.1.3 java|red|1.25.0 vscode-commons|red|0.0.6 vscode-xml|red|0.26.1 es7-react-js-snippets|rod|1.9.3 vs-code-prettier-eslint|rve|5.1.0 vscode-sanity|san|0.1.4 html5-boilerplate|sid|1.1.1 svg-preview|Sim|2.8.3 vscode-styled-components|sty|1.7.8 bootstrap4-vscode|the|6.1.0 vscode-mdx|uni|1.5.0 errorlens|use|3.15.0 intellicode-api-usage-examples|Vis|0.2.8 vscodeintellicode|Vis|1.2.30 vscode-svg-previewer|vit|0.7.0 vscode-spring-boot|vmw|1.51.0 vscode-apielements|vnc|0.6.7 vscode-java-debug|vsc|0.55.0 vscode-java-dependency|vsc|0.23.3 vscode-java-pack|vsc|0.25.15 vscode-java-test|vsc|0.40.1 vscode-lombok|vsc|1.1.0 vscode-maven|vsc|0.43.0 vscode-spring-boot-dashboard|vsc|0.13.1 vscode-spring-initializr|vsc|0.11.2 jinja|who|0.0.8 glean|wix|5.2.2 es7-react-js-snippets|woo|2.5.1 unsaved-files-vscode|wra|2.1.3 eno|Wsc|2.3.53 JavaScriptSnippets|xab|1.8.0 bootstrap-v4-snippets|Zac|1.1.3 json|Zai|2.0.2 propertylist|zho|0.0.2 material-theme|zhu|3.16.2 html-css-class-completion|Zig|1.20.0 (1 theme extensions excluded)

A/B Experiments

``` vsliv368:30146709 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 vsaa593cf:30376535 pythonvs932:30410667 py29gd2263:30899288 vsclangdc:30486549 c4g48928:30535728 dsvsc012cf:30540253 azure-dev_surveyone:30548225 282f8724:30602487 89544117:30613380 showlangstatbar:30737416 fixshowwlkth:30771522 showindicator:30805244 pythongtdpath:30769146 i26e3531:30792625 welcomedialogc:30910334 pythonnosmt12:30797651 pythonidxpt:30866567 pythonnoceb:30805159 asynctok:30898717 dsvsc013:30795093 dsvsc014:30804076 dsvsc015:30845448 pythontestfixt:30902429 pyreplss1:30897532 pythonmypyd1:30879173 pythoncet0:30885854 pythontbext0:30879054 dsvsc016:30899300 dsvsc017:30899301 dsvsc018:30899302 aa_t_chat:30882232 ```

[gjsjohnmurray]

not working

/needsMoreInfo

[vscodenpa]

Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our issue reporting guidelines. Please take the time to review these and update the issue.

Happy Coding!

[vscodenpa]

This issue has been closed automatically because it needs more information and has not had recent activity. See also our issue reporting guidelines.

Happy Coding!