What happens if there are merge conflicts during the process?

The skill identifies conflicting files and alerts the user. It provides assistance in resolving the conflicts and requires a commit before proceeding with the rest of the automation.

Does this skill automatically push changes to the remote repository?

No, for safety, the skill performs the merge and documentation updates locally. It prompts the user to perform the final 'git push' manually after reviewing the results.

How does the documentation integration work?

The skill searches for feature-specific documentation sections and automatically appends or merges them into your project's main documentation directory or README files.

Where does my feature data go after it is archived?

Feature data is moved into a versioned 'Archive/vN' folder within the feature directory, keeping your active workspace clean while preserving the history of requirements and plans.

Can I use this with branches not named 'feature/'?

Yes, while it automatically detects names from 'feature/ ' branches, you can also pass the feature name manually as an argument.

Feature Merge & Archiver

Name: Feature Merge & Archiver
Author: matteovisca

bymatteovisca

0•

生产力与工作流

Automates the merging of feature branches into main while synchronizing documentation and archiving development history.

The Feature Merge skill provides a structured, automated workflow for finalizing feature development within the Claude Project Flow ecosystem. It goes beyond standard Git commands by performing pre-merge integrity checks on requirements and plans, managing forward-merge conflict resolution, and automatically integrating feature-specific documentation into the main project docs. Once the merge is finalized, it systematically archives the feature's history into versioned folders and updates the project status database, ensuring a clean repository and a searchable long-term knowledge base for the entire team.

主要功能

010 GitHub stars

02Intelligent documentation synchronization that moves feature specs into main project docs.

03Automated Git merge workflow with integrated safety checks for requirements and plan completion.

04Versioned archiving of development history to maintain a clean root directory structure.

05Interactive conflict resolution guidance and post-merge branch cleanup.

06Cross-project knowledge indexing to make feature implementations searchable via AI.

使用场景

01Finalizing a development cycle by merging a feature branch into the main production branch with full doc updates.

02Archiving legacy feature definitions and requirements for long-term project auditability and traceability.

03Synchronizing technical documentation from isolated development branches into a centralized project wiki.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add matteovisca/claude-project-flow feature-merge

For use in Claude.ai and ChatGPT

主要功能

010 GitHub stars

02Intelligent documentation synchronization that moves feature specs into main project docs.

03Automated Git merge workflow with integrated safety checks for requirements and plan completion.

04Versioned archiving of development history to maintain a clean root directory structure.

05Interactive conflict resolution guidance and post-merge branch cleanup.

06Cross-project knowledge indexing to make feature implementations searchable via AI.

使用场景

01Finalizing a development cycle by merging a feature branch into the main production branch with full doc updates.

02Archiving legacy feature definitions and requirements for long-term project auditability and traceability.

03Synchronizing technical documentation from isolated development branches into a centralized project wiki.