Merge completed task branches into main with automated conflict resolution and verification.
npx skills add https://github.com/huacheng/moonview --skill merge-huacheng
Please help me install this Agent Skill. Skill: merge Source: https://github.com/huacheng/moonview/tree/main/plugins/task-ai/skills/merge Command: npx skills add https://github.com/huacheng/moonview --skill merge-huacheng
This Skill enables safe merging of a completed task branch into the main branch, including automated conflict resolution and verification steps, while preserving both branches and worktrees for manual cleanup later.
Run /task-ai:merge <notebook_name> to merge your completed task branch into main with automated conflict resolution.
High-intent search queries and answers about installing and using this skill.
Automated git merge conflict resolution is handled by running the merge command on a completed task branch, which performs a non-fast-forward merge into main while applying automated conflict fixes and post-merge verification checks.
Merging a task branch requires the task to be in an executing state with an ACCEPT verdict, and dependencies must meet their required statuses before the automated merge workflow can safely proceed.
Yes, automated branch merging preserves both the task branch and worktree after merging into main, keeping them intact for auditability and supporting manual cleanup only when you are ready.
The best way is using an automated merge workflow that performs pre-merge cleanup and refactoring on the task branch, then executes multi-stage post-merge handling to track progress, update targets, and generate summaries.
Automated merge failures can occur if the task-ai daemon state is not properly coordinated, as the workflow includes concurrency protection and state management to prevent conflicting operations during branch merging.
Yes, you can use Python3 and git to automate non-fast-forward merges with conflict resolution, as the merge workflow relies on these dependencies to execute automated conflict handling and verification checks.
tmalcolm-0607Automate isolated git worktree setup, synchronization, quality gates, and cleanup.
lvlup-swVerify merged PRs, backfill metadata, and prune git worktrees and branches.
vobbilisEnforce pre-merge verification and clean merge strategies for Git workflows.
michael-harrisMerge parallel development tracks into a main branch with Git worktrees.
