Skip to content

fix(server): honor configured remote diff bases - #16453

Merged
juliusmarminge merged 7 commits into
pingdotgg:mainfrom
NikitaMGrimm:fix/remote-diff-base
Oct 18, 2026
Merged

fix(server): honor configured remote diff bases#16453
juliusmarminge merged 7 commits into
pingdotgg:mainfrom
NikitaMGrimm:fix/remote-diff-base

Merge remote-tracking branch 'origin/main' into pr16453

7f1f6cb
Select commit
Loading
Failed to load commit list.
MacroscopeApp / Macroscope - Approvability Check succeeded Oct 17, 2026 in 1m 54s

Approved

  • Eligibility
  • Correctness

Note

More information about how approvability works can be found in our Help Center.

Details

Eligibility
This is a focused server-side VCS bug fix that consistently honors configured remote diff bases and verifies the actual publish ref before skipping pushes. The production change is localized and supported by targeted regression tests covering remote refs, ref collisions, previews, file contents, and publishing.

Notes:
No code owners found in target merge base 73d70a4

View more details on MacroscopeApp