SBPro
d6f334b861
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>
1.3 KiB
1.3 KiB
Architecture Decision Records
This directory contains Architecture Decision Records (ADRs) for josh-sync. Each ADR documents a significant design decision, its context, the alternatives considered, and the rationale for the chosen approach.
Index
| ADR | Title | Status |
|---|---|---|
| 001 | Josh-proxy for bidirectional sync | Accepted |
| 002 | State storage on orphan git branch | Accepted |
| 003 | Force-with-lease for forward sync | Accepted |
| 004 | Always-PR policy for reverse sync | Accepted |
| 005 | Git trailer for loop prevention | Accepted |
| 006 | Inline exclude in josh-proxy URL | Accepted |
| 007 | Reconciliation merge for filter changes | Accepted |
| 008 | First-parent ordering in reconciliation merges | Accepted |
| 009 | Tree comparison as sync skip guard | Accepted |
| 010 | Onboard workflow with checkpoint/resume | Accepted |
| 011 | Linearize fallback for reverse sync | Accepted |