gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-25 18:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Float unconflicted files in edit mode

Browse Source
This commit is contained in:
Caleb Owens 2024-10-09 11:21:51 +02:00
parent b3e3ebdb34
commit 39f9f50296
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/desktop/src/lib/components/EditMode.svelte
View File

@ -123,7 +123,16 @@
} }
const files = Array.from(outputMap.values()); const files = Array.from(outputMap.values());
files.sort((a, b) => a.path.localeCompare(b.path)); files.sort((a, b) => {
// Float conflicted files to the top
if (a.conflicted && !b.conflicted) {
return -1;
} else if (!a.conflicted && b.conflicted) {
return 1;
}
return a.path.localeCompare(b.path);
});
return files; return files;
}); });