Git Workflow

Git operations, branching strategies, commit conventions, and repository management. Use when working with version control, creating branches, writing commits, or resolving merge conflicts.

43 stars 9 forksGit & Code ReviewOfficial

Install

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add aws-samples/sample-kiro-cli-multiagent-development --skill git-workflow
Manual install
git clone --depth 1 https://github.com/aws-samples/sample-kiro-cli-multiagent-development.git /tmp/sample-kiro-cli-multiagent-development
mkdir -p ~/.claude/skills
cp -r /tmp/sample-kiro-cli-multiagent-development/skills/git-workflow ~/.claude/skills/git-workflow

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

# Git Workflow

## Commit Messages

```
<type>(<scope>): <subject>

[optional body]

[optional footer]
```

Types: `feat`, `fix`, `docs`, `style`, `refactor`, `test`, `chore`

Good: `feat(auth): add OAuth2 support for GitHub login`
Bad: `fixed stuff`

## Branch Naming

```
<type>/<ticket>-<description>
```

Examples:
- `feature/PROJ-123-user-authentication`
- `fix/PROJ-456-null-pointer-crash`
- `hotfix/PROJ-789-security-patch`

## Common Operations

```bash
# Inspect recent history without an interactive pager
git --no-pager log --oneline -10

# Create a new branch without rewriting history
git switch -c <branch-name>

# Cherry-pick a specific commit (ask first if conflicts could affect user work)
git cherry-pick <sha>

# Find the commit that introduced a bug
git bisect start
git bisect bad HEAD
git bisect good <known-good-sha>
```

Agents must not run interactive rebase, reset, force-push, or history-rewriting operations unless the user explicitly requests the exact operation and approves its risk. Never bypass hooks.

## Merge Conflict Resolution

1. Run `git status` to identify conflicted files.
2. Open each file and locate `<<<<<<<`, `=======`, and `>>>>>>>`.
3. Keep the correct code and remove every conflict marker.
4. Stage each resolved file with `git add <file>`.
5. Continue the existing merge with `git merge --continue`. If the conflict came from a rebase the user explicitly started, stop and ask the user before continuing it.

## Pre-commit Checks
Read the full skill on GitHub

Details

Skill name
git-workflow
Path
skills/git-workflow/SKILL.md
License
MIT-0
Repo updated
9 September 2026

FAQ

What does the Git Workflow skill do?

Git operations, branching strategies, commit conventions, and repository management. Use when working with version control, creating branches, writing commits, or resolving merge conflicts.

How do I install the Git Workflow skill?

skills CLI (Claude Code, Cursor, Codex and more): npx skills add aws-samples/sample-kiro-cli-multiagent-development --skill git-workflow. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Git Workflow popular?

It lives in aws-samples/sample-kiro-cli-multiagent-development, which has 43 GitHub stars and 9 forks.

Related skills

Agentcore Patterns

43

aws-samples/sample-kiro-cli-multiagent-development

Verified Amazon Bedrock AgentCore patterns for Runtime handlers, Gateway MCP clients with SigV4/IAM auth, Memory session management with Strands, and Bedrock cross-region inference-profile IAM policies. Use when building or debugging AgentCore-based agents.

AI, LLMs & Agents

AWS Technical Docs

43

aws-samples/sample-kiro-cli-multiagent-development

AWS technical documentation patterns covering procedures, lists, tables, titles, error messages, and content patterns. Use when writing AWS service documentation, procedures, troubleshooting guides, tutorials, or getting started content.

Writing & Content

CLI Execution

43

aws-samples/sample-kiro-cli-multiagent-development

CLI execution best practices covering RTK token compression, AWS discover-then-execute patterns, output control, and bash/zsh scripting with logging. Use when running CLI commands, querying AWS resources, writing automation scripts, or working with shell tooling.

Software Development

Git Worktree

107

Dimon94/skills

为每个写任务建独立工作树,并在暂停、接手、主工作树脏了或收尾时管理这些树。用于改任何仓库文件之前、用户说“暂停”、接手上一段会话,以及清理工作树时。

Git & Code Review21

Git Rebase Main

107

Dimon94/skills

将已完成的任务分支合回本地 main,并关闭对应 Issue、删除任务分支、回收临时工作树。用于本地 rebase、合回主分支与收尾;不推送目标分支。仅更新待发 PR 的分支时直接 rebase。

Git & Code Review21

Atlassian Readonly Skills

43

langpingxue/atlassian-skills

Read-only Python utilities for Jira, Confluence, and Bitbucket integration. Provides read access to issues, search, workflows, pages, pull requests, commit history, and more. Use when users need to query Atlassian products like "get a Jira issue", "search Confluence pages", "view pull request details", or "get commit history". This variant excludes all write operations for token efficiency and safety.

Git & Code Review14

Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.