What problem does it solve? Keeping a feature branch up to date with origin/main involves repetitive fetch-and-merge steps, and merge conflicts force you to choose between manual resolution and risky automation. This Skill wraps the deterministic fetch+merge plumbing in a script with clear sentinel outputs, so the agent only handles the decision-making part. ## Core Features & Use Cases - Safe Sync Mode: Fetches origin/main and merges non-interactively, reporting MERGE_OK with recent commits or stopping with a list of conflicting files for manual resolution. - Auto-Resolve Mode: With --fix or --auto-resolve, the agent reads each conflicting file, resolves it using a defined priority strategy, stages the results, and commits the merge. - Clear Error Separation: Distinguishes real content conflicts (MERGE_CONFLICTS) from non-conflict failures like dirty trees, missing refs, or failing hooks (MERGE_ERROR), preventing incorrect resolution attempts. - Use Case: Before opening a pull request, run the sync to pull the latest main into your feature branch; if conflicts appear, either resolve them yourself or let the agent merge both sides while preserving your branch's structure. ## Quick Start Ask the agent to sync my current branch with origin/main and stop if there are conflicts, or add the --fix flag to have conflicts resolved automatically.
