Skip to content
Skills Library
Programming · Automation

git-workflow

/git-workflow

Guided Git workflow assistant. Helps with branching strategies, writing conventional commits, opening pull requests, resolving merge conflicts, and keeping history clean. TRIGGER when the user writes /git-workflow or asks for help with Git, branches, commits, PRs, or merge conflicts.

Licence
MIT
Last repository change
18.10.2026

Assessment and security

100/ 100Class: good
Format25 / 25
Frontmatter with name and description, valid name, description up to 1,024 characters, name matching the folder.
Discoverability25 / 25
Description explains when to use the skill, has a reasonable length and uses third person.
Content35 / 35
At least 150 words and at most 500 lines, headings, step lists, examples or code.
Hygiene15 / 15
No placeholders such as TODO, no Windows paths, with a licence.
Riskno signals detected in the scan
Files in this package
1
Scripts
0
HTML comments
3
URLs in SKILL.md
0
Deprecation

No signals detected. Repository changed on 18.10.2026, without references to retired models or APIs.

Licence

MIT, open: use and modify while retaining author attribution.

What to check before installing
  • SKILL.md zawiera komentarze HTML (3). Nie widać ich w podglądzie Markdown, a model je czyta.

What it does and when to use it

Guided Git workflow assistant. Helps with branching strategies, writing conventional commits, opening pull requests, resolving merge conflicts, and keeping history clean. TRIGGER when the user writes /git-workflow or asks for help with Git, branches, commits, PRs, or merge conflicts.

Original author description

Guided Git workflow assistant. Helps with branching strategies, writing conventional commits, opening pull requests, resolving merge conflicts, and keeping history clean. TRIGGER when the user writes /git-workflow or asks for help with Git, branches, commits, PRs, or merge conflicts.

How it works

  1. Detect context
  2. Branching
  3. Committing
  4. Pull Requests
  5. Merge conflict resolution
  6. Keeping history clean
  7. Output format
Original SKILL.md headings · 124 lines, 490 words
SKILL.md preview
---
name: git-workflow
description: >
  Guided Git workflow assistant. Helps with branching strategies, writing
  conventional commits, opening pull requests, resolving merge conflicts, and
  keeping history clean. TRIGGER when the user writes /git-workflow or asks
  for help with Git, branches, commits, PRs, or merge conflicts.
metadata:
  author: kambleakash0
  version: 1.0.0
triggers:
  - /git-workflow
---

# Git Workflow Skill

You are a Git workflow expert. Guide the user through best-practice Git operations step by step.

## Detect context

Before doing anything, run:

```bash
git status
git log --oneline -10
```

Use the output to understand:

- Current branch
- Uncommitted changes
- Recent commit history

Then ask the user what they want to do if it is not already clear from their message.

## Branching

When creating a new branch:

1. Confirm the base branch (usually `main` or `develop`).
2. Pull the latest changes: `git pull origin <base>`.
3. Create a descriptive branch name following the pattern `<type>/<short-description>`:
   - `feat/add-login-page`
   - `fix/null-pointer-in-auth`
   - `chore/update-dependencies`
   - `docs/api-reference`
4. Create and switch: `git checkout -b <branch-name>`.

## Committing

Write commits that follow the **Conventional Commits** spec:

```md
<type>(<optional scope>): <short imperative summary>

[optional body explaining *why*, not what]

[optional footer: BREAKING CHANGE, closes #issue]
```

Allowed types: `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `chore`, `ci`, `build`, `revert`.

Rules:

- Summary is ≤ 50 characters, lowercase, no trailing period.
- Use the body for non-obvious reasoning.
- Reference issues with `closes #<n>` or `refs #<n>`.

When the user has staged changes, suggest a commit message based on the diff:

```bash
git diff --cached
```

## Pull Requests

Before opening a PR:

1. Rebase onto the latest base branch to keep history linear:

   ```bash
   git fetch origin
   git rebase origin/main
   ```

2. Run tests and linters.
3. Push the branch: `git push -u origin <branch-name>`.
4. Draft a PR description using this template:

```md
## What & Why
<!-- One paragraph explaining the change and its motivation. -->

## How
<!-- Key implementation decisions. -->

## Testing
<!-- How was this tested? -->

## Checklist
- [ ] Tests pass
- [ ] Docs updated (if needed)
- [ ] No unintended side effects
```

## Merge conflict resolution

When conflicts are detected:

1. List conflicting files: `git diff --name-only --diff-filter=U`.
2. For each file, show the conflict markers and explain both sides.
3. Suggest the correct resolution based on the intent of each change.
4. After resolving, stage the file: `git add <file>`.
5. Continue the rebase or merge: `git rebase --continue` / `git merge --continue`.

## Keeping history clean

| Situation | Command |
| ----------- | ----------- |
| Amend last commit message | `git commit --amend` |
| Squash last N commits | `git rebase -i HEAD~N` |
| Undo last commit (keep changes) | `git reset --soft HEAD~1` |
| Drop a commit from history | `git rebase -i <parent-sha>` |
| Remove a file from history | `git filter-repo --path <file> --invert-paths` (requires `pip install git-filter-repo`) |

Always warn before any history-rewriting command that has been pushed to a shared branch.

## Output format

After every operation, show:

- The exact commands run
- The output
- What the next step is

Keep explanations concise. If something could go wrong, warn proactively.

Versions

RepositoryScoreLicence
This page · kambleakash0/agent-skills100MIT
event4u-app/agent-config100MIT
lee-w/maigo100MIT
hakula139/plugins100MIT
ericrisco/rsc-harness100MIT
Sanit-mann/The-Insectoids100MIT
eliyce/paqad-ai100MIT
langfuse/langfuse100MIT
Muvon/octomind-tap100Apache-2.0

Identical content appears in 1 other GitHub folders. We show one copy with the highest score.

Database snapshot: 13.11.2026 · package version 6b7bf0659947 (SHA-256 digest of the entire package)

Downloads in the last 30 days: 0 · ranking

Report a problem with this skill: harmful content, incorrect descriptions or an author’s removal request.

Similar skills

  • 100git-practices
    Git conventions for branches, commits, and pull requests. Load this skill whenever creating branches, writing commit messages, or opening PRs. Trigger on any git workflow operation — commits, branches, pull requests, or merge operations.
  • 100git-commit-and-workflow
    Git commit, branch and pull request best practices using Conventional Commits. Use whenever creating commits, naming branches, preparing pull requests, writing commit messages, or when asked to commit, push, merge or release code.
  • 100git
    Git version control best practices: branching, commits, merging, conflict resolution, PR workflows. Use when managing branches, creating commits, merging code, or resolving conflicts.
  • 100managing-git
    Manages Git workflows including branching, commits, and pull requests. Use when working with Git, creating commits, opening PRs, managing branches, resolving conflicts, or when asked about version control best practices.
  • 91version-control
    Expert guidance for Git version control, trunk-based development workflows, and GitHub best practices. Emphasizes Conventional Commits for clean history, short-lived feature branches, frequent integration, and professional collaboration patterns. Use when users need help with…
  • 100git
    Guide for Git operations including commits, branches, rebasing, and conflict resolution. Use when working with version control, creating commits, managing branches, or resolving merge conflicts.

Feedback and reports

Your message goes to Bartosz Sokoliński. An email address is needed only for a reply. See the privacy policy.