skills.rest
kittne
kittneCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Enforce branching, Conventional Commits, and safe merging across Git repositories.

Updated Aug 27, 2026
Search Tags:#git#workflow#branching#code-review#pull-request#conventional-commits#rebasing
One-click install
npx skills add https://github.com/kittne/codex-skills-by-codex --skill git-workflow-kittne
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/kittne/codex-skills-by-codex/tree/main/git-workflow
Command: npx skills add https://github.com/kittne/codex-skills-by-codex --skill git-workflow-kittne

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Use when the user requests Git help or when preparing commits, branches, or PRs. Enforce a clean, repo-agnostic workflow: branching, Conventional Commits, changelog hygiene (when the repo uses one), safe rebasing/merging, and recovery/rollback practices.

Core Features & Use Cases

  • Branching: Create a scoped work branch and avoid committing directly to the default branch.
  • Conventional Commits: Enforce standardized commit messages to improve history clarity.
  • Staging Discipline: Stage changes deliberately to keep commits cohesive.
  • Changelog and Versioning: Respect existing changelog and versioning rules when applicable.
  • Syncing With Base Branch: Choose merge or rebase per repo convention.
  • PR Preparation: Ensure PRs include a clear summary, testing notes, and documentation updates when needed.
  • Recovery and Rollback: Support stash, amend, and revert operations to recover from mistakes.
  • References: Consult references/git-workflow.md for deeper guidance.
  • Extended Guidance: Provide guidance for conflicts, releases, and edge cases.
  • Conflict Resolution Defaults: Use git status and diff to guide resolutions and keep changes focused.

Quick Start

Identify the repository's default branch, create a scoped feature branch, commit with Conventional Commits, and open a PR with a clear summary.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I enforce conventional commits in my Git workflow?▼

Conventional commits standardize your Git workflow by enforcing structured commit message prefixes like feat or fix. This improves history clarity, keeps commits cohesive, and maintains consistent changelog hygiene across all repository branches.

What is the best way to prepare a pull request with clean Git branches?▼

Preparing a clean pull request involves creating a scoped feature branch, staging changes deliberately for cohesive commits, and ensuring the PR includes a clear summary with testing notes and documentation updates. Avoid committing directly to the default branch.

Does this Git workflow approach work with both rebasing and merging?▼

This Git workflow supports both rebasing and merging by letting you choose your syncing method per repository convention. It ensures safe rebasing and merging practices while keeping your feature branch synchronized with the base branch.

How do I resolve Git merge conflicts during a rebase?▼

Resolving Git merge conflicts during a rebase involves using git status and git diff to guide resolutions. Keep your changes focused on the scoped work branch to minimize conflicts and maintain a clean, repo-agnostic workflow.

How do I recover from a bad Git commit using amend and revert?▼

Recovering from a bad Git commit involves using stash, amend, or revert operations. These recovery and rollback practices allow you to safely undo mistakes while ensuring your commit history remains clean and your repository state stays stable.

Related Skills

Explore More Software Engineering Skills→
pradeepmoulipradeepmouli
2

speckit-git-initialize

Initialize a Git repository with configurable branch and .gitignore settings.

Community
Intermediate
levkisslevkiss

github

Manage GitHub repositories via GitHub CLI for commits, branches, pull requests, issues, releases, and Pages deployment.

Community
Advanced
johnlindquistjohnlindquist
24

diff-preview

Analyze git diffs to explain changes and assess impact before committing.

Community
Basic
sipherxyzsipherxyz
1

merge-main

Merge the main branch into a feature branch with stashing and conflict resolution.

Official
Advanced