Skip to content

CSM 1.17 updates#497

Merged
hoppea2 merged 2 commits into
mainfrom
mirror-main
Jun 2, 2026
Merged

CSM 1.17 updates#497
hoppea2 merged 2 commits into
mainfrom
mirror-main

Conversation

@csmbot

@csmbot csmbot commented May 12, 2026

Copy link
Copy Markdown
Collaborator

Description

Automated mirror of internal repository with cleaned references.

Additionally, this PR now includes merge-conflict resolution by merging main into mirror-main and resolving the README.md conflict.

GitHub Issues

List the GitHub issues impacted by this PR:

GitHub Issue #

Checklist:

  • I have performed a self-review of my own code to ensure there are no formatting, vetting, linting, or security issues
  • I have verified that new and existing unit tests pass locally with my changes
  • I have not allowed coverage numbers to degenerate
  • I have maintained at least 90% code coverage
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • Backward compatibility is not broken

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also list any relevant details for your test configuration

  • Merged origin/main into mirror-main and verified README.md conflict markers were removed
  • make build (blocked in sandbox due private dependency access)

@hoppea2

hoppea2 commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Done — I resolved the merge conflict and merged main into this branch in commit c8e88c3.

Copilot AI requested a review from hoppea2 June 2, 2026 20:54
@hoppea2 hoppea2 merged commit a93a6b3 into main Jun 2, 2026
@hoppea2 hoppea2 deleted the mirror-main branch June 2, 2026 20:57
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.

3 participants