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.

Sign up for GitHub

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

Jump to bottom

Source Controle pannel Can't check conflicts detail. #113258

Closed
chokingwin opened this issue Dec 22, 2020 · 3 comments
Closed

Source Controle pannel Can't check conflicts detail. #113258

chokingwin opened this issue Dec 22, 2020 · 3 comments
Assignees
@eamodio
Labels
*duplicate Issue identified as a duplicate of another issue(s)

Comments

@chokingwin
Copy link

When i merge dev branch to master,they are some conflicts happened.
But i can't check the detail of these conflicts in Source Controle pannel.
@inmativ
Copy link

inmativ commented Dec 22, 2020

У меня аналогичная проблема. При этом я могу открывать файлы через встроенный файловый менеджер и разрешать конфликты. Но сама панель контроля версий не работает. Проблема воспроизводится на другой синхронизированной машине. Отключение всех дополнений не помогает.

@winlx
Copy link

winlx commented Dec 22, 2020 •
edited
Loading

Temporary solution here #112717 (comment)

@eamodio
Copy link
Contributor

eamodio commented Jan 5, 2021

Duplicate of #112537 (which will be fixed in tomorrow's insiders)

@eamodio eamodio closed this as completed Jan 5, 2021
@eamodio eamodio added the *duplicate Issue identified as a duplicate of another issue(s) label Jan 5, 2021
@github-actions github-actions bot locked and limited conversation to collaborators Feb 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@eamodio eamodio

Labels
*duplicate Issue identified as a duplicate of another issue(s)
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@eamodio @winlx @chokingwin @inmativ