Skip to content

Simplify the file conflict dialog - #2540

Open
jancborchardt wants to merge 1 commit into
mainfrom
feat/simplify-conflict-dialog
Open

Simplify the file conflict dialog#2540
jancborchardt wants to merge 1 commit into
mainfrom
feat/simplify-conflict-dialog

feat(ConflictPicker): simplify the file conflict dialog

c7ba85a
Select commit
Loading
Failed to load commit list.
DCO / DCO succeeded Jul 30, 2026 in 0s

DCO

All commits are signed off!

View more details on DCO