skills.rest
larsnyg
larsnygCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Manage Git branching, merging, and conflict resolution workflows.

Updated Dec 20, 2025
Search Tags:#git#workflow#CI/CD#branching#merging#conventional-commits#conflicts
One-click install
npx skills add https://github.com/larsnyg/claude-code-template-sql --skill git-workflow-larsnyg
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/larsnyg/claude-code-template-sql/tree/main/.claude/skills/git-workflow
Command: npx skills add https://github.com/larsnyg/claude-code-template-sql --skill git-workflow-larsnyg

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill standardizes Git workflows, improves collaboration, ensures clean commit history, and reduces merge conflicts by providing proven branching and commit conventions.

Core Features & Use Cases

  • Branching Strategies: Consistent feature, release, and hotfix branches.
  • Conventional Commits: Standardized commit messages for clarity and automation.
  • Merge Conflict Resolution: Best practices and strategies for resolving conflicts.
  • Remote Workflows: Collaboration with teammates via forks, PRs, and CI integration.

Quick Start

Describe your repository workflow and CI/CD requirements, and I will propose a standard branch model and commit conventions.

Frequently Asked Questions about git-workflow

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve merge conflicts in Git?▼

Merge conflicts occur when changes overlap between branches. Identify conflicted files, manually edit them to choose or combine versions, then stage and commit the resolution. This Skill provides best practices and strategies for handling conflicts efficiently.

What's the best way to structure Git branches for team collaboration?▼

Branching strategies like Git Flow use dedicated feature, release, and hotfix branches to organize work and prevent conflicts. This Skill proposes standard branch models matched to your repository workflow and CI/CD requirements.

How do I write standardized commit messages for automated tooling?▼

Conventional commits follow a format (type, scope, description) that enables automated changelog generation and semantic versioning. This Skill applies commit conventions to improve clarity and support automation in your pipeline.

Can I use Git workflows with CI/CD pipelines?▼

Yes. Remote workflows integrate branching and commits with CI/CD by triggering builds on pull requests and automating checks. This Skill covers peer review, remote synchronization, and integration patterns for continuous deployment.

How do I manage feature development without blocking releases?▼

Trunk-based and feature-branch strategies isolate work while keeping main deployable. This Skill helps you choose a model that balances isolation, integration frequency, and release cadence for your team.

Related Skills

Explore More Software Engineering Skills→
jralphjralph

git-workflow

Enforce Conventional Commits, pre-commit hooks, and semantic versioning in Git workflows.

Community
Intermediate
concept2cureconcept2cure

ship

Automate the ship workflow from branch merge to pull request creation.

Community
Advanced
eysenfalkeysenfalk

git-workflow

Enforce Git branch naming, commit message formats, and merge policies.

Community
Advanced
phucle297phucle297

caveman-commit

Generate concise conventional commit messages for Git repositories.

Community
Intermediate