What happens to my feature documentation after the merge?

Feature-specific docs are integrated into the main project documentation directory and the original development notes are moved to a versioned archive folder (e.g., Archive/v1) for future reference.

Does it work with different main branch names?

Yes, the skill automatically detects common naming conventions including 'main', 'master', and 'develop' to identify your primary development branch.

How does the skill handle git merge conflicts?

The skill performs a forward merge from the main branch into your feature branch first. If conflicts are detected, it identifies the files and pauses to allow you to resolve them before proceeding with the final merge.

What are the pre-merge requirements?

The skill checks that your working tree is clean, all defined requirements and plans in the project flow are marked as complete, and that feature documentation has been generated.

Does this skill automatically push my code to GitHub?

No, for safety and final review, the skill performs all merge operations locally. It will provide you with the exact git command to push your changes once you are ready.

Feature Merge Flow

Name: Feature Merge Flow
Author: matteovisca

bymatteovisca

0•

Developer Tools

Automates the end-to-end process of merging feature branches into main while synchronizing documentation and project status.

The feature-merge skill streamlines the transition from development to production by managing the complex handoff process within the Claude Project Flow framework. It automates critical pre-merge checks—verifying that requirements and plans are complete—performs forward merges to resolve conflicts early, and ensures that feature-specific documentation is correctly integrated into the main project docs. By automatically archiving development notes and updating the project's internal database, it maintains a clean repository and a searchable knowledge base, making it indispensable for developers following structured development lifecycles.

Key Features

01Automated git merge workflow with pre-merge dependency and status validation.

02Documentation integration that merges feature-specific docs into the main project wiki or README.

03Feature archiving system that moves historical development documents into versioned folders.

04Interactive conflict detection and resolution guidance for smoother branch integration.

050 GitHub stars

06Cross-project knowledge indexing to make implemented feature details searchable.

Use Cases

01Maintaining a consistent documentation trail by automatically updating project docs during the merge process.

02Finalizing a development sprint by merging multiple completed features into the main production branch.

03Standardizing the feature lifecycle from implementation to archival for better team collaboration.

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

Key Features

01Automated git merge workflow with pre-merge dependency and status validation.

02Documentation integration that merges feature-specific docs into the main project wiki or README.

03Feature archiving system that moves historical development documents into versioned folders.

04Interactive conflict detection and resolution guidance for smoother branch integration.

050 GitHub stars

06Cross-project knowledge indexing to make implemented feature details searchable.

Use Cases

01Maintaining a consistent documentation trail by automatically updating project docs during the merge process.

02Finalizing a development sprint by merging multiple completed features into the main production branch.

03Standardizing the feature lifecycle from implementation to archival for better team collaboration.