post-merge-sync

What problem does it solve?

Post-merge workflows often leave developers with stale local branches, leftover stashes, and an unclear list of follow-ups after a PR lands on the trunk, causing silent drift and repeated manual cleanup.

Core Features & Use Cases

• Safe trunk fast-forward: Detects the repo’s actual trunk branch, fetches/prunes, and fast-forwards the remote-trunk state without forceful history rewriting.
• Stash-safe recovery: Stashes uncommitted work when needed and restores it on the originating feature branch or on a new branch—avoiding dangerous “stash pop on trunk” mistakes.
• Merge-informed punch list: Scans the merged PR’s implications using living docs, rebasable open PRs, TODO/follow-up markers, and a merge-commit-based diff range to produce a quick “what’s left” summary.
• Squash/rebase aware branch handling: Avoids unsafe deletion patterns and requires explicit opt-in before any force-delete when local-only commits may become unreachable.

Quick Start

After you merge a PR (e.g., “I just merged the OA signed PR into master”), run post-merge-sync to fast-forward the trunk safely, restore your WIP on the right branch, and generate a punch list of follow-ups implied by the merge.