[Sync Conflict] mono/main → main #23

Manually merged

sbpro merged 5 commits from auto-sync/mono-main-20260602-120147 into main 2026-06-02 15:31:08 +00:00

Conversation 0 Commits 5 Files Changed 1

-4

itkan-sysadmin commented 2026-06-02 12:01:48 +00:00

Owner

Copy Link

Copy Source

Sync Conflict

Monorepo main has changes that conflict with main.

Conflicted files:

• CHANGELOG.md

Please resolve and merge this PR to complete the sync.

## Sync Conflict Monorepo `main` has changes that conflict with `main`. **Conflicted files:** - CHANGELOG.md Please resolve and merge this PR to complete the sync.

itkan-sysadmin added 5 commits 2026-06-02 12:01:48 +00:00

Adopt josh-sync for josh-sync ... 4df4044f20

Sync-Origin: adopt/main/2026-05-28T03:19:12Z

Sync from monorepo 2026-05-28T04:24:11Z ... 5f942bced4

Sync-Origin: forward/main/2026-05-28T04:24:11Z

Update CHANGELOG.md 9071e17d31

Merge pull request '[Subrepo Sync] main → main' (#5) from auto-sync/subrepo-main-20260528-042619 into main ... b82311829c

Reviewed-on: sdlc/sdlc#5

test: remove bidirectional sync smoke-test markers ... 8776ccf2d2

Drops the test markers added during the 2026-05-28 onboarding-verification
round-trip (forward + reverse leg). The adopt strategy is live and the
CHANGELOG is back to its 2.2.0-release state.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

sbpro manually merged commit 427cc4c3f1 into main 2026-06-02 15:31:08 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No labels

Milestone

No items

No Milestone

Assignees

Clear assignees

itkan-sysadmin sbpro

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pe/josh-sync#23