Skip to content

[WIP] The conflict dialog is shown when there is a conflict between 2 files. currently, mimetype icons are shown as placeholders. #8707

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

Closed
Copilot wants to merge 1 commit into from

Initial plan

dca5f22
Select commit
Loading
Failed to load commit list.
Closed

[WIP] The conflict dialog is shown when there is a conflict between 2 files. currently, mimetype icons are shown as placeholders. #8707

Initial plan
dca5f22
Select commit
Loading
Failed to load commit list.
DCO / DCO succeeded Sep 5, 2025 in 0s

DCO

All commits are signed off!

View more details on DCO