What happens if a conflict is too complex for the AI?

If the skill encounters ambiguous conflicts or code that fails to compile after resolution, it is instructed to stop and request human intervention.

Does this skill require the Jujutsu (jj) CLI?

Yes, this skill is specifically tailored for the Jujutsu version control system and utilizes 'jj' commands for log tracking and conflict resolution.

What is an octopus merge?

An octopus merge is a single git or jujutsu commit that combines more than two parent branches at once, typically used to integrate multiple features simultaneously.

How does the skill handle rebased parents?

It continuously monitors parent change IDs and uses 'jj workspace update-stale' to ensure your local merge commit reflects the most recent state of the rebased parents.

Does it automatically push changes to the server?

The skill focuses on local conflict resolution and merge management; final squashing and pushes are typically handled once all parents have successfully reached the main branch.

Octopus Merge Manager

Name: Octopus Merge Manager
Author: sjawhar

bysjawhar

•

开发者工具

Automates the management and resolution of multi-parent octopus merges and conflict cycles in Jujutsu (jj) version control.

The Octopus Merger skill is designed for developers using the Jujutsu (jj) version control system who need to manage complex merge commits involving multiple parents. It provides a structured workflow for monitoring rebased parents, syncing stale workspaces, and resolving intricate multi-sided conflicts that arise during large-scale integrations. By continuously watching for changes and automating the squashing and cleanup process, this skill ensures that high-concurrency merge operations remain stable and eventually reach a clean state on the main branch.

主要功能

01Multi-sided conflict resolution guidance for complex merges

02Intelligent detection and squashing of split commits and orphans

03Automated monitoring of multi-parent commit states in Jujutsu

042 GitHub stars

05Periodic status reporting on merge progress and conflict status

06Real-time workspace synchronization for rebased parent branches

使用场景

01Automating the cleanup of complex Jujutsu revision graphs after a long-running merge

02Integrating multiple feature branches into a single staging or main commit

03Maintaining stable merge commits while upstream parents undergo frequent rebasing

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add sjawhar/dotfiles octopus-merger

For use in Claude.ai and ChatGPT

Download Skill