Skip to content

chore: merge main into sprint-17 (resolve ceremony conflicts)#662

Merged
laynepenney merged 3 commits intosprint-17from
chore/merge-main-into-sprint-17
Apr 11, 2026
Merged

chore: merge main into sprint-17 (resolve ceremony conflicts)#662
laynepenney merged 3 commits intosprint-17from
chore/merge-main-into-sprint-17

Conversation

@laynepenney
Copy link
Copy Markdown
Collaborator

Summary

  • Merge main into sprint-17 to resolve binary image conflicts (sprint-15 hero images added in both branches)
  • Code files (channel.py, test_channel.py) merged cleanly
  • Unblocks ceremony PR recall#659

Premium boundary: core OSS (recall infrastructure).

Test plan

  • All code merges are automatic (no manual resolution needed for .py files)
  • Binary conflicts resolved by keeping sprint-17 versions

laynepenney and others added 3 commits April 10, 2026 15:37
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
…-sprint-17

# Conflicts:
#	docs/blog/images/sprint-15-recap-hero-raw.png
#	docs/blog/images/sprint-15-recap-hero.png
@laynepenney laynepenney merged commit e9850f8 into sprint-17 Apr 11, 2026
0 of 10 checks passed
@laynepenney laynepenney deleted the chore/merge-main-into-sprint-17 branch April 11, 2026 12:54
@github-actions
Copy link
Copy Markdown
Contributor

Thank you for your contribution! Before we can merge this PR, we need you to sign our Contributor License Agreement.

To sign, please comment on this PR with the following exact text:

I have read the CLA Document and I hereby sign the CLA

You can also re-trigger the CLA check by commenting recheck.


I have read the CLA Document and I hereby sign the CLA


You can retrigger this bot by commenting recheck in this Pull Request. Posted by the CLA Assistant Lite bot.

@github-actions github-actions bot locked and limited conversation to collaborators Apr 11, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant