skills.rest
avel123111
avel123111COMMUNITY
Explore all skills by this author →
GitHub

ecc-git-workflow

Guides Git branching strategies, commit conventions, and collaborative development workflows.

Updated May 26, 2026
Search Tags:#git#code review#version control#pull request#conventional commits#merge conflicts#branching strategy
One-click install
npx skills add https://github.com/avel123111/triplanio --skill ecc-git-workflow-avel123111
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: ecc-git-workflow
Source: https://github.com/avel123111/triplanio/tree/main/.claude/skills/ecc-git-workflow
Command: npx skills add https://github.com/avel123111/triplanio --skill ecc-git-workflow-avel123111

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams struggle with inconsistent Git practices: unclear branching strategies, vague commit messages, messy merge conflicts, and risky history rewrites. This Skill provides concrete patterns for choosing a branching model, writing conventional commits, resolving conflicts, and managing releases. ## Core Features & Use Cases - Branching Strategy Selection: Compares GitHub Flow, trunk-based development, and GitFlow with decision criteria based on team size and release cadence. - Commit & PR Conventions: Provides Conventional Commits format, PR templates, and code review checklists for consistent collaboration. - Conflict Resolution & History Management: Covers merge vs rebase trade-offs, conflict resolution commands, stash workflows, and safe undo operations. - Use Case: A team lead setting up a new repository can use this Skill to pick GitHub Flow, enforce conventional commit messages, and document a PR review checklist for contributors. ## Quick Start Ask the assistant to recommend a Git branching strategy and commit message convention for your team's project.

Frequently Asked Questions about ecc-git-workflow

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

FAQPage Schema
How do I choose a Git branching strategy for my team?▼

Choose based on team size and release cadence: GitHub Flow suits continuous deployment and small teams, trunk-based development fits experienced teams with feature flags deploying multiple times daily, and GitFlow works for scheduled releases in enterprise settings.

What is the Conventional Commits format?▼

Conventional Commits uses the structure type(scope): subject, with types like feat, fix, docs, refactor, test, and chore. The subject uses imperative mood under 50 characters, and the body explains why the change was made.

When should I use git rebase vs git merge?▼

Use merge when integrating feature branches into main to preserve exact history, especially for shared branches. Use rebase to update a local-only feature branch with the latest main for a linear history, but never rebase pushed or shared branches.

How do I resolve Git merge conflicts?▼

Run git status to see conflicted files, then edit the conflict markers manually, use git mergetool, or accept one side with git checkout --ours or --theirs. After resolving, stage the files with git add and commit.

How do I undo a commit that was already pushed?▼

Use git revert HEAD to create a new commit that undoes the changes, then push. Avoid git reset --hard or force-pushing on shared branches, since rewriting public history breaks other contributors' work.

Related Skills

Explore More Software Engineering Skills→
jacksonlee-twjacksonlee-tw

git-workflow

Automates Git feature branch creation, Conventional Commit staging, and GitLab push workflows.

Community
Intermediate
kortix-aikortix-ai
20.2k

pr-qa

Runs scheduled QA sweeps that test, deploy, and verify each pull request against a test environment.

Official
Advanced
zaiyemeiyou404zaiyemeiyou404

requesting-code-review

Automate code review with pre-commit security scans and quality checks.

Community
Advanced
doanchienthangdevdoanchienthangdev
4

Stacked Diffs Workflow

Implement stacked diffs workflows for breaking large code changes into reviewable PRs.

Community
Advanced