conflicts

What problem does it solve?

Continuously fetches the latest main and merges it into the current branch, automatically resolving conflicts to keep development moving without manual intervention.

Core Features & Use Cases

• Automatic main syncing: regularly pull and merge main into feature branches to stay up to date.
• Automated conflict resolution: resolves conflicts using a deterministic strategy that preserves intent from both sides where possible.
• Operational loop: runs on a 90-second polling cycle and exits after 10 consecutive conflict-free cycles.

Quick Start

Start the conflict-resolver loop to automatically fetch, merge, and resolve conflicts every 90 seconds for up to 10 clean cycles.