Automatic upstream detection reached conflicted and stopped before any mutation.
| field |
value |
target main |
d3154f092486426aafecbf4385be34ccbac86315 |
source main |
d3037064e61a9f059eafbd4f9869679779bd2a7c |
| merge base |
ca72e381c64f25d771236eecf70219f68e5f365b |
| upstream commits |
2 |
| changed paths |
41 |
Conflicting paths
apps/server/src/cloud/bootService.test.tsapps/server/src/cloud/bootService.tsapps/server/src/cloud/selfUpdate.test.tsapps/server/src/cloud/selfUpdate.tsapps/server/src/serverRuntimeStartup.ts
Hotspot matches
apps/server/src/cli/servicePreflight.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cloud/bootService.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/bootService.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/pinnedRuntime.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/pinnedRuntime.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/selfUpdate.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/selfUpdate.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/serviceLauncherClient.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/serviceLauncherClient.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/servicePreflight.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/servicePreflight.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/serviceProtocol.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/persistence/Migrations.ts — owner persistence (Shared migration registry; Marcode and upstream migrations must retain unique ordered ids)apps/server/src/provider/Layers/ProviderSessionReaper.ts — owner provider-runtime (Provider-specific Marcode behavior)
Reproduce locally (read-only, disposable worktree)
The bot did not resolve conflicts, did not push an integration branch, and did not open a
pull request. Resolve this by hand: see docs/operations/upstream-sync.md.
Automatic upstream detection reached
conflictedand stopped before any mutation.maind3154f092486426aafecbf4385be34ccbac86315maind3037064e61a9f059eafbd4f9869679779bd2a7cca72e381c64f25d771236eecf70219f68e5f365bConflicting paths
apps/server/src/cloud/bootService.test.tsapps/server/src/cloud/bootService.tsapps/server/src/cloud/selfUpdate.test.tsapps/server/src/cloud/selfUpdate.tsapps/server/src/serverRuntimeStartup.tsHotspot matches
apps/server/src/cli/servicePreflight.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cloud/bootService.test.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/bootService.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/pinnedRuntime.test.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/pinnedRuntime.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/selfUpdate.test.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/selfUpdate.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/serviceLauncherClient.test.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/serviceLauncherClient.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/servicePreflight.test.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/servicePreflight.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/serviceProtocol.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/persistence/Migrations.ts— ownerpersistence(Shared migration registry; Marcode and upstream migrations must retain unique ordered ids)apps/server/src/provider/Layers/ProviderSessionReaper.ts— ownerprovider-runtime(Provider-specific Marcode behavior)Reproduce locally (read-only, disposable worktree)
The bot did not resolve conflicts, did not push an integration branch, and did not open a
pull request. Resolve this by hand: see docs/operations/upstream-sync.md.