tidy

Name: tidy
Availability: InStock
Author: HomericIntelligence

Rebase local Git branches onto the trunk and resolve conflicts via a swarm.

6|Updated Dec 29, 2025

Search Tags:#automation #git #devops #workflows #branch-management #rebasing #tidy

Ready to run

npx skills add https://github.com/HomericIntelligence/ProjectHephaestus --skill tidy-homericintelligence

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: tidy
Source: https://github.com/HomericIntelligence/ProjectHephaestus/tree/main/skills/tidy
Command: npx skills add https://github.com/HomericIntelligence/ProjectHephaestus --skill tidy-homericintelligence

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Tidy local Git branches and fix failed rebases across a repository by coordinating a Myrmidon swarm to complete in-progress rebases, while ensuring no destructive actions on branches taken by the swarm.

Core Features & Use Cases

Verifies that the working tree is clean or prompts the user to commit or stash changes.
Runs gh tidy --rebase-all --trunk <default> interactively and delegates remaining work to a swarm of agents for failing branches.
Never deletes branches; only gh-tidy and its safe prompts may delete branches, and only with explicit confirmation.
After successful rebases, re-arms PR merge automation for related pull requests.

Quick Start

Invoke the tidy skill in Claude Code with your preferred options to clean up local branches and finish rebases.

Frequently Asked Questions about tidy

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I rebase all local git branches onto the trunk automatically?▼

You can rebase all local git branches onto the trunk by running an interactive command that delegates failing rebases to a swarm of agents for semantic conflict resolution. This process ensures your local branch history stays aligned with the main codebase.

How do I fix a failed git rebase with merge conflicts?▼

To fix a failed git rebase, a controlled swarm of up to five concurrent agents handles semantic conflict resolution interactively. This automated approach completes in-progress rebases that standard command-line tools could not finish.

What happens to uncommitted changes when cleaning up local git branches?▼

When cleaning up local git branches, the tool first verifies your working tree is clean. If uncommitted changes are detected, it prompts you to either commit or stash them before proceeding with the rebase operations.

Can I safely delete local branches during an automated rebase workflow?▼

You can safely delete local branches because the swarm of agents never performs destructive deletions. Branch deletion is strictly limited to explicit user confirmation prompts from the underlying safe automation tool.

Do I need any specific tools installed to automate local branch rebasing?▼

Yes, you need the gh-tidy command-line tool installed to automate local branch rebasing. The system builds upon gh-tidy for initial operations and deploys a swarm of agents to resolve conflicts for branches that gh-tidy cannot finish.

What should I do after successfully rebasing local branches?▼

After successfully rebasing local branches, you should re-arm PR merge automation for related pull requests. This ensures your updated branch history integrates smoothly with continuous integration and automated merge workflows.