Is there a safety check before merging?

Yes, it includes a 7-point pre-merge checklist covering test status, synchronization, conflict resolution, and code cleanliness.

What branch naming convention does this skill use?

It uses a structured format: feature/CR-NNN-description for new features and hotfix/NNN-description for urgent fixes, ensuring all work is traceable.

What is the recommended merge strategy?

The skill recommends using git merge --no-ff when merging feature branches into development to preserve branch history and visibility.

How does it handle commit messages?

It enforces a format starting with [TASK-NNN] followed by a brief description, ensuring every change is linked to a specific task or ticket.

Does it support merge conflict resolution?

Yes, it provides a step-by-step process for identifying, understanding, and resolving conflicts followed by mandatory testing before the final commit.

Git Workflow Manager

Name: Git Workflow Manager
Author: dsivov

bydsivov

0•

Developer Tools

Standardizes Git operations through strict branch naming, atomic commit practices, and structured merge workflows.

This skill optimizes version control processes by enforcing a professional Git lifecycle, including standardized branch naming conventions, atomic commit guidelines, and robust conflict resolution strategies. It ensures team consistency by requiring task-referenced commits, regular synchronization with development branches, and a comprehensive pre-merge checklist to maintain code quality and repository history integrity.

Key Features

010 GitHub stars

02Includes a 7-point pre-merge quality assurance checklist

03Enforces structured branch naming (feature/hotfix) with task IDs

04Outlines a step-by-step branch lifecycle from creation to cleanup

05Streamlines merge conflict resolution and synchronization processes

06Provides atomic commit guidelines with mandatory task referencing

Use Cases

01Standardizing version control practices across an AI-driven development team

02Managing complex feature branches and ensuring clean commit histories

03Resolving merge conflicts systematically while maintaining development branch stability

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add dsivov/ai_development_team git-workflow

For use in Claude.ai and ChatGPT

Key Features

010 GitHub stars

02Includes a 7-point pre-merge quality assurance checklist

03Enforces structured branch naming (feature/hotfix) with task IDs

04Outlines a step-by-step branch lifecycle from creation to cleanup

05Streamlines merge conflict resolution and synchronization processes

06Provides atomic commit guidelines with mandatory task referencing

Use Cases

01Standardizing version control practices across an AI-driven development team

02Managing complex feature branches and ensuring clean commit histories

03Resolving merge conflicts systematically while maintaining development branch stability

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add dsivov/ai_development_team git-workflow

For use in Claude.ai and ChatGPT