What happens if there are merge conflicts?

The skill identifies the conflicts, displays the affected files, helps you resolve them, and requires a successful test run once the conflicts are fixed.

Does this skill create Pull Requests?

No, this skill is specifically designed for local merges to a development branch and does not handle remote Pull Request creation or production deployments.

Why does it run tests again after the merge?

Merged code can often break even if both individual branches were passing; running tests on the merged result ensures the integration is truly stable.

Can I use this for my production or main branch?

No, this skill is intentionally restricted to merging into the development branch to prevent accidental, unvetted changes from reaching production.

Does it delete my work automatically?

It only deletes the local feature branch after a successful merge and verification is complete, ensuring your work is safely integrated first.

Git Development Merge

Name: Git Development Merge
Author: petrogurcak

bypetrogurcak

0•

Developer Tools

Automates the transition of code from feature branches to the development branch with integrated verification and cleanup.

This skill streamlines the Git workflow by automating the repetitive tasks involved in merging a feature branch into a development environment. It handles initial commits, branch switching, and merging while crucially re-running test suites and builds on the final merged result to ensure integration stability. Once verification passes, it automatically cleans up local feature branches and git worktrees, maintaining a tidy workspace and preventing the accidental accumulation of stale branches.

Key Features

01Intelligent merge conflict detection and resolution assistance

02Post-merge test suite and build verification

03Automated Git commit and merge to development branch

040 GitHub stars

05Automatic cleanup of local feature branches and worktrees

06Evidence-based reporting of merge and test success

Use Cases

01Automating the cleanup of stale local branches after successful integration

02Finalizing a feature and integrating code into the shared development branch

03Ensuring code remains functional after integration through mandatory post-merge testing

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add petrogurcak/skills merge

For use in Claude.ai and ChatGPT

Download Skill