Is there a risk of losing uncommitted work?

The skill performs a prerequisite check for uncommitted changes on the main branch and skips branches without commits to ensure data integrity before starting the merge process.

What types of tests can it run after merging?

It automatically detects the project environment and can execute 'npm test', 'pytest', or 'cargo test' to verify that the integrated code remains stable.

Which files can be automatically resolved during a conflict?

It includes specialized logic for merging package.json dependencies, deduplicating import statements, and combining type definitions and configuration files like JSON and YAML.

How does the Merge Resolver handle conflicts it cannot solve?

If an automatic resolution fails, the skill aborts that specific merge, preserves the branch and worktree, and generates a detailed 'merge-conflict.md' report with specific manual resolution steps.

InfiStack Merge Resolver

Name: InfiStack Merge Resolver
Author: blueif16

byblueif16

生产力与工作流

Automates the sequential merging of completed project modules while resolving conflicts and validating integration through automated testing.

关于

The InfiStack Merge Resolver is a specialized skill designed for complex development projects that utilize a modular worktree structure. It orchestrates the transition from development to integration by automatically fetching completed branches, merging them in dependency order using advanced algorithms like 'patience', and attempting to resolve common conflicts in files like package.json or type definitions. By cleaning up temporary worktrees and running comprehensive test suites before generating a detailed final execution report, it ensures a seamless and validated transition to the main codebase with minimal manual intervention.

主要功能

Comprehensive Markdown execution reporting with manual intervention guidance
Sequential dependency-aware merging of multiple feature branches
Intelligent auto-resolution for common conflicts in JSON, YAML, and import statements
0 GitHub stars
Dynamic cleanup of Git worktrees and feature branches upon successful merge
Automated post-merge integration testing for Node.js, Python, and Rust

使用场景

Streamlining the consolidation of complex feature branches into a production-ready main branch
Automating the integration phase of multi-agent AI development workflows
Managing large-scale modular refactors across multiple concurrent Git worktrees

关于

主要功能

Comprehensive Markdown execution reporting with manual intervention guidance
Sequential dependency-aware merging of multiple feature branches
Intelligent auto-resolution for common conflicts in JSON, YAML, and import statements
0 GitHub stars
Dynamic cleanup of Git worktrees and feature branches upon successful merge
Automated post-merge integration testing for Node.js, Python, and Rust

使用场景

Streamlining the consolidation of complex feature branches into a production-ready main branch
Automating the integration phase of multi-agent AI development workflows
Managing large-scale modular refactors across multiple concurrent Git worktrees