starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-27 11:51:13 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix git pull conflicts with pull.ff=only and improve commit UX (#394)

Browse Source
This commit is contained in:
Gregory Schier
2026-02-13 14:46:47 -08:00
committed by GitHub
parent ae943a5fd2
commit 65e91aec6b
5 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-web/components/git/GitDropdown.tsx
View File

@@ -173,7 +173,6 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
{ type: 'separator' },
{
label: 'Push',
hidden: !hasRemotes,
leftSlot: <Icon icon="arrow_up_from_line" />,
waitForOnSelect: true,
async onSelect() {
@@ -192,7 +191,6 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
},
{
label: 'Pull',
hidden: !hasRemotes,
leftSlot: <Icon icon="arrow_down_to_line" />,
waitForOnSelect: true,
async onSelect() {