agentleFS
SeleznovIvanSeleznovIvan/claude-skills-test/.claude/skills/git-workflow/SKILL.md

git-workflow

Skill1 starsChanged 10 months agoMITView on GitHub

Git expert for version control workflows. Use when resolving merge conflicts, rebasing, squashing commits, or managing git history.

187 other projects use a version of this.

Adopted by

Most recently taken up by

Used with

Projects with it also use squad-commands, ci-cd-pipelines and 10 more.

Other files people use alongside this one.

Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
  • Microsoft AzureSkill

    squad-commands

    Categorized catalog of common Squad operations. Coordinator reads this file and presents it as an interactive menu when the user asks for available commands or help.

    Also in 5 projects that use this

  • harrissohail6Skill

    ci-cd-pipelines

    CI/CD pipeline design and implementation. Auto-activates when discussing deployment, automation, or pipelines.

    Also in 6 projects that use this

  • Microsoft AzureSkill

    architectural-proposals

    How to write comprehensive architectural proposals that drive alignment before code is written

    Also in 4 projects that use this

  • frostneySkill

    native-nostalgia-stack

    Applies the user's FreePascal toolchain and its build, formatting, hook, and test contracts while leaving project-specific mechanics local. Use when scaffolding or working in a FreePascal project that follows this toolchain.

    Also in 3 projects that use this

  • AGMO-IncSkill

    plugin-review

    Use to analyze plugin usage patterns and suggest improvements. Triggers on "플러그인 리뷰", "plugin review", "사용 패턴 분석".

    Also in 3 projects that use this

  • Galaxy-DawnSkill

    results-report

    This skill should be used when the user asks to "write an experiment report", "summarize experimental results", "do experiment retrospection", "write a results report", "写实验总结报告", "写实验复盘", or mentions turning completed experiment artifacts into a structured, decision-oriented research report. It assumes strict analysis should come from `results-analysis` first.

    Also in 3 projects that use this

  • +6 more from Azure

The file

Files
SKILL.md

Git Workflow Skill

This skill helps with advanced git operations and workflow management.

Capabilities

  • Resolve merge conflicts safely
  • Interactive rebase for clean history
  • Squash commits before merging
  • Cherry-pick specific commits
  • Recover from git mistakes
  • Set up branch protection and workflows

Use When

  • Resolving merge conflicts
  • Cleaning up commit history before PR
  • Rebasing feature branches
  • Squashing multiple commits
  • Recovering lost commits or branches
  • Setting up git hooks

Examples

# Interactive rebase to squash last 3 commits
git rebase -i HEAD~3

# Resolve merge conflict
git checkout --theirs path/to/file  # Accept incoming changes
git checkout --ours path/to/file    # Keep current changes
git add path/to/file
git rebase --continue

# Recover deleted branch
git reflog
git checkout -b recovered-branch HEAD@{2}

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.