starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-25 10:18:31 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Merge branch 'main' into wip/yaak-proxy-foundation

Browse Source 
# Conflicts:
#	apps/yaak-client/components/JsonBodyEditor.tsx
#	apps/yaak-client/lib/jsonComments.ts
#	package-lock.json
#	packages/theme/src/window.ts
#	packages/ui/src/components/HeaderSize.tsx
This commit is contained in:
Gregory Schier
2026-03-11 15:36:57 -07:00
parent 7be53ca330 8a330ad1ec
commit 6600116b1a
40 changed files with 1187 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/yaak-client/components/git/GitDropdown.tsx
View File

@@ -75,7 +75,7 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
const currentBranch = status.data.headRefShorthand;
const hasChanges = status.data.entries.some((e) => e.status !== 'current');
const hasRemotes = (status.data.origins ?? []).length > 0;
const _hasRemotes = (status.data.origins ?? []).length > 0;
const { ahead, behind } = status.data;
const tryCheckout = (branch: string, force: boolean) => {