Fix master build break from PR #247/#248 merge skew#249
Merged
Conversation
PRs #248 (NearbyCard → ai-event-summary) and #247 (ai-event-summary → master) merged 19s apart. NearbyCard was written against older PlayaDB APIs; git merged with no textual conflict, but the result references signatures that no longer exist, so master no longer compiles. PR CI built each PR branch, not the post-merge tree, so it slipped through. Two semantic merge-skew fixes: - NearbyCardViewModel.swift: EventFilter's current init orders `region` before `includeExpired`; the call used the old order. Match the existing correct usage in NearbyViewModel. - NearbyCardViewModelTests.swift: EventOccurrence's init is (id:eventId:startTime:endTime:) — the test used a stale (eventUid:…:year:) shape. Match the canonical pattern in EventHourSectionTests. Verified: iBurn app build 0 errors; NearbyCardViewModelTests + RightNowCandidateTests 11 passed; PlayaDB RTree tests 9 passed. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JXw53U9BhHpRbdGF78XJ9d
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
mastercurrently does not compile. On 2026-05-31, two PRs merged 19 seconds apart:claude/fervent-knuth-adf76a→ai-event-summary) — NearbyCard map overlayai-event-summary→master) — AI event summary highlights, which swept up the Add nearby card overlay to the main map #248 mergeNearbyCard was written against older PlayaDB APIs. Git merged both with no textual conflict, but the merged tree references signatures that no longer exist. Each PR's CI built its own branch, not the post-merge result, so the break landed on
masterunnoticed.Fixes (2 lines, semantic merge skew)
NearbyCardViewModel.swift:271EventFilter(includeExpired: true, region: region)EventFilter(region: region, includeExpired: true)NearbyCardViewModelTests.swift:62EventOccurrence(eventUid: uid, …, year: 2025)EventOccurrence(eventId: uid, startTime:…, endTime:…)Both now match the canonical existing usages (
NearbyViewModel.swift:275,EventHourSectionTests.swift:23).Verification
xcodebuild build(iBurn, iPhone 17 Pro Max, iOS 26.2): 0 errors, 6 pre-existing warningsiBurnTests/NearbyCardViewModelTests+RightNowCandidateTests: 11 passedswift test --filter RTree: 9 passedNotes
Docs/2026-06-19-merge-repair-and-sync.mdcaptures the full root-cause analysis.origin/master; its tree is byte-identical toai-event-summary, so the merge commit added no new content beyond the skew.🤖 Generated with Claude Code