Can I merge a task that hasn't officially passed validation?

By default, the skill requires a 'passed' status in the manifest to prevent merging unverified code. However, you can use the --force flag to bypass this check.

Does this skill require specific project scripts?

Yes, it relies on a task-manifest.sh script (consistent with the 'principled' framework) to manage and verify the status of development tasks.

Can I keep the worktree after the merge is complete?

Yes, by using the --no-cleanup flag, you can perform the merge while keeping the worktree and branch intact for further inspection or manual verification.

What happens if a merge conflict occurs?

The skill will update the task manifest status to 'conflict', report the specific files involved, and halt the process. You are then prompted to resolve the conflicts manually before re-running the command.

Merge Work

Name: Merge Work
Author: alexnodeland

byalexnodeland

•

Productivity & Workflow

Automates the integration of completed task branches back into the working branch while managing manifest updates and worktree cleanup.

The Merge Work skill is a specialized utility for managing the lifecycle of specification-driven development tasks within Claude Code. It automates the transition from implementation to integration by verifying task completion status, performing non-fast-forward git merges from isolated worktrees, and systematically cleaning up temporary branches and directories. This ensures a consistent project history and a clutter-free development environment by bridging the gap between isolated task execution and the main codebase.

Key Features

01Automated git branch discovery and non-fast-forward merging

02Force-merge options for manual workflow overrides

03Pre-merge verification against task manifest status

043 GitHub stars

05Automated git worktree removal and branch deletion

06Integrated conflict detection and status reporting

Use Cases

01Cleaning up multiple temporary git worktrees after a successful testing phase

02Updating project manifests to reflect the 'merged' status of specific features

03Finalizing an implementation task and integrating code into the primary development branch

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add alexnodeland/principled merge-work

For use in Claude.ai and ChatGPT

Download Skill