skills.rest
Fabric-Pro
Fabric-ProOFFICIAL
Explore all skills by this author →
WebsiteGitHub

git-workflow

Manage Git branching, commits, rebasing, and merge conflict resolution workflows.

3|Updated Aug 26, 2026
Search Tags:#git#version control#conventional commits#branching#merge conflict#rebase#gitflow
One-click install
npx skills add https://github.com/Fabric-Pro/fabric-oss --skill git-workflow-fabric-pro
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/Fabric-Pro/fabric-oss/tree/main/.cursor/skills/git-workflow
Command: npx skills add https://github.com/Fabric-Pro/fabric-oss --skill git-workflow-fabric-pro

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? It helps developers maintain clean version control history, resolve merge conflicts, and follow consistent branching and commit conventions when collaborating on code. ## Core Features & Use Cases - Branching Strategies: Implements feature branch workflows, Gitflow, and trunk-based development with naming conventions. - Commit Standards: Enforces Conventional Commits formatting with types like feat, fix, refactor, and docs. - History Management: Covers interactive rebase, squashing, cherry-picking, stashing, and recovery via reflog. - Use Case: When a feature branch falls behind main and has messy WIP commits, use interactive rebase to squash and clean history before opening a pull request. ## Quick Start Ask the assistant to help rebase your current feature branch onto main and rewrite the last three commits using Conventional Commits messages.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I resolve a Git merge conflict?▼

Run git status to find conflicted files, then edit each file to resolve the sections marked with <<<<<<<, =======, and >>>>>>>. Stage the resolved files with git add and complete the merge with git commit, or abort with git merge --abort.

How to write good commit messages with Conventional Commits?▼

Use the format type(scope): subject, where type is feat, fix, refactor, docs, style, test, chore, or perf. Keep the subject concise and add a body explaining why the change was made, referencing issue numbers in the footer.

When should I use rebase instead of merge?▼

Use rebase to update a local feature branch with the latest main changes and keep a linear history before opening a pull request. Never rebase commits that have already been pushed to shared branches, since it rewrites history.

How do I undo a commit in Git without losing changes?▼

Use git reset --soft HEAD~1 to undo the last commit while keeping all changes staged. To keep changes unstaged use git reset HEAD~1, and to safely undo a pushed commit use git revert, which creates a new inverse commit.

What is the difference between Gitflow and trunk-based development?▼

Gitflow uses long-lived main and develop branches plus feature, release, and hotfix branches for structured releases. Trunk-based development commits small changes directly to main with short-lived branches and feature flags, favoring continuous integration.

Related Skills

Explore More Software Engineering Skills→
shellicarshellicar

preflight

Validate git repository identity, remote reachability, and branch alignment before a cast.

Community
Intermediate
HomericIntelligenceHomericIntelligence
18

verify-pr-ready

Validate GitHub Pull Requests for CI status, approvals, and merge conflicts.

Official
Intermediate
kreuzberg-devkreuzberg-dev
836

git-standards

Enforce Conventional Commits and pre-commit hooks for formatting, linting, and tests.

Official
Intermediate
wahidyankfwahidyankf
3

repo-practicing-trunk-based-development

Enforce small, frequent commits to the main branch for Trunk Based Development workflows.

Community
Advanced