🐛 Fixed
- Dynamic primary branch detection: Replaced 26 hardcoded
"main"branch references across 13 files with dynamic detection viaresolve_primary_branch(). Repos usingmaster,develop, or custom primary branches now work correctly for merge operations, branch resolution, manifest status checks, and CLI defaults. - Deduplicated branch resolution: Consolidated 4 duplicate copies of
_resolve_primary_branch()scattered across CLI commands into a single centralized implementation incore/git_ops.pywith lightweight delegating wrappers. - Multi-parent merge target:
create_multi_parent_base()now accepts explicittarget_branchparameter instead of hardcoding"main"for merge-base calculations.
✅ Added
- 20 integration tests covering master/develop/custom branch scenarios for primary branch detection, target branch resolution, manifest status, multi-parent merge, and conflict prediction.