Jinjing 3d557fc939 Fall back to a merge when a divergent pull has no reconciliation strateg ...

- Git 2.27+ refuses `git pull` on divergent branches unless pull.rebase or
  pull.ff is configured. Retry with `--no-rebase` (Git's historical default)
  so pulls succeed out of the box on fresh hosts.
- Skip the fallback whenever the caller already specified a reconciliation
  strategy (e.g. --ff-only, --rebase) so explicit policies still fail as
  expected on divergence.
- Applied identically in the local git pull path and the relay/SSH git
  handler so both surfaces behave the same way.

2026-07-13 01:39:31 -07:00

..

branch-rename.test.ts

Fix automatic branch rename for non-English git locales (#8012)

2026-07-10 01:03:16 -07:00

branch-rename.ts

Fix automatic branch rename for non-English git locales (#8012)

2026-07-10 01:03:16 -07:00

check-ignored-paths.test.ts

perf(file-explorer): batch and debounce ignored checks (#8103)

2026-07-10 19:10:01 -07:00

check-ignored-paths.ts

perf(file-explorer): batch and debounce ignored checks (#8103)

2026-07-10 19:10:01 -07:00

checkout.ts

Fix git submodule path cache retention (#7687)

2026-07-11 01:30:19 -07:00

commit-object-ref.test.ts

Skip broad fetch for PR SHA worktree bases

2026-06-16 14:57:39 -07:00

commit-object-ref.ts

Skip broad fetch for PR SHA worktree bases

2026-06-16 14:57:39 -07:00

commit.test.ts

feat(source-control): commit action in sidebar panel (#1373)

2026-05-03 17:19:52 -07:00

fetch-error-classification.test.ts

Fix start-from PR failures for fork-backed PRs (#2233)

2026-05-18 00:36:34 -07:00

fetch-error-classification.ts

Fix start-from PR failures for fork-backed PRs (#2233)

2026-05-18 00:36:34 -07:00

fork-sync.ts

refactor(net): use AbortSignal.timeout for fetch timeouts, fix fork-sync clobbered cancel (#7504)

2026-07-05 23:09:14 -07:00

gh-rate-limit-breaker.test.ts

perf(source-control): stop gh rate-limit storms and idle git-status spawn churn (#7595)

2026-07-06 15:12:56 -07:00

gh-rate-limit-breaker.ts

perf(source-control): stop gh rate-limit storms and idle git-status spawn churn (#7595)

2026-07-06 15:12:56 -07:00

git-capability-state.test.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-capability-state.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

git-runtime-options.ts

Improve inactive workspace cleanup UX (#3600)

2026-06-28 11:38:23 -07:00

git-username.ts

Fix Windows slow startup and multi-minute UI freezes (#7225) (#7266)

2026-07-03 19:40:45 -04:00

history.ts

Add project Windows runtime selection (#5519)

2026-06-17 16:08:14 -07:00

hosted-remote-url.test.ts

feat: expandable commits and actions in the git history panel (#5419)

2026-06-15 19:28:45 -07:00

hosted-remote-url.ts

lint(unicorn): enable prefer-number-properties, prefer-array-find, prefer-array-index-of (#7516)

2026-07-05 23:56:37 -07:00

huge-folder-ignore.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

huge-folder-ignore.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

max-buffer-overflow.ts

Handle buffer overflows gracefully and truncate diffs fairly (#5083)

2026-06-09 23:56:36 -07:00

push-target-validation.ts

Add project Windows runtime selection (#5519)

2026-06-17 16:08:14 -07:00

remote.test.ts

Fall back to a merge when a divergent pull has no reconciliation strateg

2026-07-13 01:39:31 -07:00

remote.ts

Fall back to a merge when a divergent pull has no reconciliation strateg

2026-07-13 01:39:31 -07:00

remove-worktree.test.ts

Fix git submodule path cache retention (#7687)

2026-07-11 01:30:19 -07:00

repo-clone-path.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

repo-clone-path.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

repo-default-base-timeout.test.ts

perf: avoid blocking base-ref resolution (#8182)

2026-07-11 02:05:58 -07:00

repo-detection.test.ts

fix: detect valid repos when git rev-parse can't confirm (#6173)

2026-07-01 15:10:35 -07:00

repo-search-ref-compat.test.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

repo-username.test.ts

Fix Windows slow startup and multi-minute UI freezes (#7225) (#7266)

2026-07-03 19:40:45 -04:00

repo.test.ts

fix(worktrees): fall back from stale default base refs (#7398)

2026-07-04 21:31:51 -07:00

repo.ts

perf: avoid blocking base-ref resolution (#8182)

2026-07-11 02:05:58 -07:00

runner-command-exec.test.ts

Honor configured SSH for remote-base worktrees (#5739)

2026-06-18 15:52:55 -07:00

runner-gh-rate-limit-breaker.test.ts

perf(source-control): stop gh rate-limit storms and idle git-status spawn churn (#7595)

2026-07-06 15:12:56 -07:00

runner-wsl-gh-fallback.test.ts

Fix GitLab auth diagnostic waking WSL (#7967)

2026-07-09 18:06:30 -04:00

runner.test.ts

Fix automatic branch rename for non-English git locales (#8012)

2026-07-10 01:03:16 -07:00

runner.ts

perf(file-explorer): batch and debounce ignored checks (#8103)

2026-07-10 19:10:01 -07:00

status-cquoted-paths.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

status-discard-symlink.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

status-pathspec-literals.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

status-porcelain-parser.test.ts

Support submodule diffs and upstream-base compares in Source Control (#6350)

2026-06-28 23:43:33 -07:00

status-porcelain-parser.ts

Support submodule diffs and upstream-base compares in Source Control (#6350)

2026-06-28 23:43:33 -07:00

status-submodule-path-cache.test.ts

Add Grok orchestration group routing (#8058)

2026-07-11 21:43:20 -07:00

status-upstream-negative-cache.test.ts

Reduce CPU from source-control git polling on Windows (#6736)

2026-06-29 15:25:13 -07:00

status-upstream-probe-churn.test.ts

perf(source-control): stop gh rate-limit storms and idle git-status spawn churn (#7595)

2026-07-06 15:12:56 -07:00

status-wsl-pathspecs.test.ts

Fix WSL source control path separators (#7966)

2026-07-09 18:04:06 -04:00

status.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

status.ts

Fix git submodule path cache retention (#7687)

2026-07-11 01:30:19 -07:00

upstream.test.ts

Add project Windows runtime selection (#5519)

2026-06-17 16:08:14 -07:00

upstream.ts

Add project Windows runtime selection (#5519)

2026-06-17 16:08:14 -07:00

worktree-base-ref-probe.ts

fix(worktrees): fall back from stale default base refs (#7398)

2026-07-04 21:31:51 -07:00

worktree-git-capabilities.test.ts

fix(git): cache unsupported capabilities per host (#8109)

2026-07-10 18:19:36 -07:00

worktree-list-paths.test.ts

Make Windows workspace deletion reliable and respect Git locks (#7963)

2026-07-10 17:52:50 -07:00

worktree-separate-git-dir.test.ts

chore(lint): upgrade oxlint to 1.71 + enable 7 new rules (autofixed backlog) (#6841)

2026-06-29 22:38:29 -07:00

worktree.test.ts

Fix worktree scan generation cache leak (#7675)

2026-07-11 13:44:10 -07:00

worktree.ts

Fix worktree scan generation cache leak (#7675)

2026-07-11 13:44:10 -07:00