[Sync Conflict] mono/main → main #24

Manually merged
sbpro merged 7 commits from auto-sync/mono-main-20260716-091132 into main 2026-07-16 09:19:53 +00:00
7 Commits
Author SHA1 Message Date
sbproandClaude Sonnet 5 27b0e2acaa feat(josh-sync): add rename command for safe target renames
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
2026-07-16 10:10:40 +01:00
sbpro c4bcbbdd4f Merge origin/main into auto-sync merge 2026-06-08 13:38:42 +01:00
sbpro 0128b66a2f Merge remote-tracking branch 'origin/auto-sync/subrepo-main-20260608-123127'
# Conflicts:
#	tools/josh-sync/CHANGELOG.md
2026-06-08 13:38:08 +01:00
sbpro efe8a19fce fix(action): allow forward sync from trailer commits 2026-06-08 13:29:31 +01:00
itkan-sysadmin b936030606 Merge pull request '[Subrepo Sync] main → main' (#6) from auto-sync/subrepo-main-20260602-153914 into main
Reviewed-on: sdlc/sdlc#6
2026-06-02 15:39:39 +00:00
sbpro e4b9ed31b3 Merge remote-tracking branch 'origin/auto-sync/mono-main-20260602-120147'
# Conflicts:
#	CHANGELOG.md
2026-06-02 16:28:21 +01:00
sbpro ad84a76f8d fix(import): include tracked ignored files 2026-06-02 15:02:19 +01:00