Resolve merge conflicts in optimus-tasks.md while preserving state.json status data.
npx skills add https://github.com/alexgarzao/optimus --skill optimus-resolve
Please help me install this Agent Skill. Skill: optimus-resolve Source: https://github.com/alexgarzao/optimus/tree/main/resolve/skills/optimus-resolve Command: npx skills add https://github.com/alexgarzao/optimus --skill optimus-resolve
This skill helps engineering teams resolve merge conflicts in optimus-tasks.md caused by parallel edits to the task structure, ensuring critical status data remains in state.json and not in the markdown file.
Invoke the optimus-resolve skill when optimus-tasks.md shows merge conflicts and follow the prompts to auto-resolve where possible while requesting user decisions for unresolved fields.
High-intent search queries and answers about installing and using this skill.
To resolve merge conflicts in a markdown task management file, the skill parses conflict regions and compares per-task fields across two-way conflicts, safely merging structural columns while preserving status data in state.json. Ambiguous changes are presented for user decisions.
Handling git merge conflicts for task IDs without losing status data requires isolating structural markdown changes from status tracking. The skill safely merges structural columns in optimus-tasks.md while avoiding changes to status data stored in state.json.
Conflict resolution handles added or removed tasks during a git rebase by applying additive handling across task IDs. It compares per-task fields in two-way conflicts and stages resolved changes for user review after validating against formatting rules.
You can auto-resolve optimus-tasks.md conflicts while keeping state.json untouched. The skill automatically merges unambiguous structural columns and stages changes, only requesting user decisions for unresolved fields to ensure status data integrity.
This conflict resolution approach validates the final markdown file against the system's formatting rules. After resolving structural conflicts and handling adds or deletes, it ensures the merged output complies with formatting standards before staging.
You should manually review ambiguous changes during markdown conflict resolution when per-task fields cannot be safely auto-merged. The skill detects these ambiguous changes across task IDs and presents them as user decisions before final validation.
alexgarzaoParse optimus-tasks.md and render a compact status dashboard with task annotations.
FabienDehopreResolve in-progress Git merge and rebase conflicts by analyzing changes and completing integration.
yangsi7Transform implementation plans into prioritized user-story task lists.
CuriousLearnerAnalyze Git merge conflict types and propose automated or manual resolution strategies.
