pe/josh-sync
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity
Files
v1.3
josh-sync/VERSION

2 lines
6 B
Plaintext
Raw Permalink Normal View History

Add linearize fallback for reverse sync and workflow guide (v1.3) When josh-proxy rejects a reverse sync push due to unmappable merge commits, fall back to linearizing: cherry-pick regular commits individually, squash only the merge commits via cherry-pick -m 1. Also adds a recommended Git workflow section to the guide explaining where cross-branch merges should happen (monorepo) vs feature work (subrepo), and expands troubleshooting for the "josh rejected push" error with root cause analysis and prevention advice. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-17 12:48:17 +03:00
1.3.0
Copy Permalink