mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2026-03-07 22:40:40 -08:00
a0e7a6ec57
Introduce end-to-end tests and server-side support for mobile-style Smart HTTP git sync. Adds a new mobileSyncConflict.feature and extended sync.step definitions to simulate HTTP clone/sync cycles, pushes, and assertions (including file content checks and HTTP readiness/backoff). Introduces src/services/gitServer/mergeUtilities.ts to resolve .tid conflicts (mobile metadata wins, body merged) and common git helpers, and wires those into the git server (use runGitCollectStdout, DESKTOP_GIT_IDENTITY, and mergeAfterPush endpoint). Misc: update workspace restart flow and settings handling, tweak test helpers (skip screenshot capture for file steps), adjust slugify rules, minor UI/formatting change, and bump git-sync-js dependency (with lockfile update). |
||
|---|---|---|
| .. | ||
| dataTable.ts | ||
| mockOAuthServer.ts | ||
| mockOpenAI.test.ts | ||
| mockOpenAI.ts | ||
| paths.ts | ||
| timeout-config.ts | ||
| timeouts.ts | ||
| webContentsViewHelper.ts | ||