starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-25 19:01:14 +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

4
src-web/components/git/callbacks.tsx
View File

@@ -2,13 +2,13 @@ import type { GitCallbacks } from '@yaakapp-internal/git';
import { sync } from '../../init/sync';
import { promptCredentials } from './credentials';
import { promptDivergedStrategy } from './diverged';
import { promptUncommittedChangesStrategy } from './uncommitted';
import { addGitRemote } from './showAddRemoteDialog';
import { promptUncommittedChangesStrategy } from './uncommitted';
export function gitCallbacks(dir: string): GitCallbacks {
return {
addRemote: async () => {
return addGitRemote(dir);
return addGitRemote(dir, 'origin');
},
promptCredentials: async ({ url, error }) => {
const creds = await promptCredentials({ url, error });