[Sync Conflict] mono/main → main #24

2026-07-16T09:11:33Z

itkan-sysadmin commented

2026-07-16 09:11:33 +00:00

Sync Conflict

Monorepo main has changes that conflict with main.

Conflicted files:

CHANGELOG.md
VERSION

Please resolve and merge this PR to complete the sync.

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

itkan-sysadmin added 7 commits 2026-07-16 09:11:34 +00:00

fix(import): include tracked ignored files ad84a76f8d

Merge remote-tracking branch 'origin/auto-sync/mono-main-20260602-120147' e4b9ed31b3

# Conflicts:
#	CHANGELOG.md

Merge pull request '[Subrepo Sync] main → main' (#6 ) from auto-sync/subrepo-main-20260602-153914 into main b936030606

Reviewed-on: sdlc/sdlc#6

fix(action): allow forward sync from trailer commits efe8a19fce

Merge remote-tracking branch 'origin/auto-sync/subrepo-main-20260608-123127' 0128b66a2f

# Conflicts:
#	tools/josh-sync/CHANGELOG.md

Merge origin/main into auto-sync merge c4bcbbdd4f

feat(josh-sync): add rename command for safe target renames 27b0e2acaa

Adds `josh-sync rename <target>` (PE-12): safely rename a sync target's
name, subfolder, and/or subrepo_url in one resumable operation, editing
.josh-sync.yml and migrating its state-branch files atomically instead of
orphaning them. Bumps josh-sync to v2.3.0.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TNXgcFWVgSh3wkQS55cCX6

sbpro manually merged commit 2df5fd7d06 into main

2026-07-16 09:19:53 +00:00

sbpro deleted branch auto-sync/mono-main-20260716-091132

2026-07-16 09:23:19 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pe/josh-sync#24