skills.rest
fabioc-aloha
fabioc-alohaCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

Git Workflow Skill

Enforce Git commit message conventions and outline branching strategies.

1|1|Updated Nov 20, 2025
Search Tags:#git#workflow#version control#commit#branching#recovery
One-click install
npx skills add https://github.com/fabioc-aloha/AIRS_Data_Analysis --skill git-workflow-skill-fabioc-aloha
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: Git Workflow Skill
Source: https://github.com/fabioc-aloha/AIRS_Data_Analysis/tree/main/.github/skills/git-workflow
Command: npx skills add https://github.com/fabioc-aloha/AIRS_Data_Analysis --skill git-workflow-skill-fabioc-aloha

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill provides clear, consistent practices for using Git, ensuring safer operations, efficient recovery from errors, and a streamlined workflow.

Core Features & Use Cases

  • Commit Conventions: Enforces a structured format for commit messages for better readability and automation.
  • Safe Operations: Guides users on how to perform risky Git operations safely, including checkpoints and tagging.
  • Recovery Patterns: Offers commands to undo commits, restore files or folders, and reset to known good states.
  • Branching Strategy: Outlines a clear strategy for managing feature, fix, and release branches.
  • Conflict Resolution: Provides steps for effectively resolving merge conflicts.
  • Stashing: Manages temporary storage of changes.
  • Worktrees: Explains the use of Git worktrees for isolating agent sessions.

Quick Start

Use the Git Workflow Skill to safely undo your last commit while keeping the changes.

Frequently Asked Questions about Git Workflow Skill

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

FAQPage Schema
How do I undo a git commit while keeping my changes?▼

To undo a git commit while keeping your changes, you can use the reset and restore commands outlined in this Skill. It provides recovery patterns to safely revert your repository state without losing your uncommitted work.

What is the best way to format git commit messages?▼

The best way to format git commit messages is by using structured conventions like feat, fix, or refactor. This Skill enforces these commit types to ensure better readability and automation in your workflow.

How do I resolve git merge conflicts effectively?▼

To resolve git merge conflicts effectively, follow the structured steps provided by this Skill. It outlines specific procedures for conflict resolution to ensure safe merges and a clean branching strategy.

When should I use git worktrees for isolating sessions?▼

You should use git worktrees when you need to isolate agent sessions or parallel tasks. This Skill explains how worktrees allow you to manage multiple working directories without interfering with your main branch.

Can I use a specific branching strategy for feature and fix branches?▼

Yes, you can use a specific branching strategy for feature and fix branches. This Skill outlines a clear strategy to manage feature, fix, and release branches for streamlined version control.

Related Skills

Explore More Software Engineering Skills→
botPhUbotPhU

git-expert

Guide Git conflict resolution, branching strategies, and repository maintenance.

Community
Basic
mixomatmixomat

clean-gone-branches

Delete local git branches marked [gone] while skipping worktree branches.

Community
Intermediate
johniejohnie
2

commit

Analyzes staged and unstaged git changes to create atomic commits with conventional messages and optional push.

Community
Intermediate
dorriodorrio

ln-003-push-all

Commit and push all local changes to the remote repository.

Community
Basic