Skip to content

fix: resolve merge conflicts with main in example files#513

Merged
gka merged 2 commits intofix/tooltip-facet-positioningfrom
copilot/sub-pr-509
Mar 2, 2026
Merged

fix: resolve merge conflicts with main in example files#513
gka merged 2 commits intofix/tooltip-facet-positioningfrom
copilot/sub-pr-509

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Mar 2, 2026

fix/tooltip-facet-positioning conflicted with main in two example files where both sides modified the same Map.get() spread lines differently — the branch dropped ?? {}, while main replaced it with as object.

Changes

  • shift-map.svelte — adopt main's as object cast over the branch's bare spread
  • spike-map.svelte — same resolution
<!-- before (branch) -->
...electionByFips.get(Number(feat.id))

<!-- after (resolved) -->
...(electionByFips.get(Number(feat.id)) as object)

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 2, 2026

Deploy Preview for svelteplot ready!

Name Link
🔨 Latest commit 1598ed2
🔍 Latest deploy log https://app.netlify.com/projects/svelteplot/deploys/69a5e313d2c30700084ef265
😎 Deploy Preview https://deploy-preview-513--svelteplot.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

Co-authored-by: gka <617518+gka@users.noreply.github.com>
Copilot AI changed the title [WIP] Fix facet-aware Pointer and HTMLTooltip positioning fix: resolve merge conflicts with main in example files Mar 2, 2026
Copilot finished work on behalf of gka March 2, 2026 19:21
@gka gka marked this pull request as ready for review March 2, 2026 20:30
@gka gka merged commit 2524e2a into fix/tooltip-facet-positioning Mar 2, 2026
4 checks passed
@gka gka deleted the copilot/sub-pr-509 branch March 2, 2026 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants