Resolve merge conflicts on PR #14260
completedBOLT-1838 / PR #14260. Slava explicitly requested conflict resolution. Update the existing PR branch BOLT-1838/domains-site against base BOLT-1824/domains-site in a dedicated worktree; resolve conflicts preserving both intended changes; run relevant lint/typecheck/tests; commit with required Co-authored-by trailer; push and confirm GitHub reports mergeable. Do not merge.
Event Timeline
created
progress
Resolved PR #14260 against BOLT-1824/domains-site and pushed merge commit a08dcdb. Preserved DST-aware completeness/retry behavior alongside DB-first fetch-on-miss and DAM ingestion changes. Local yarn lint and yarn build pass. Focused Jest is blocked locally by the pre-existing missing Prisma interactiveTransactions preview flag; CI is now running.
status_change
in_progress → completed