skills.rest
octave-commons
octave-commonsOFFICIAL
Explore all skills by this author →
GitHub

git-workflow

Coordinates Git branching, commits, conflict resolution, rebasing, and GitHub CLI pull requests across teams.

1|Updated Jan 13, 2026
Search Tags:#git#workflow#branching#commits#code-review#pull-requests#conflicts
One-click install
npx skills add https://github.com/octave-commons/gates-of-aker --skill git-workflow-octave-commons
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/octave-commons/gates-of-aker/tree/main/.opencode/skills.disabled/git-workflow
Command: npx skills add https://github.com/octave-commons/gates-of-aker --skill git-workflow-octave-commons

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Manage Git workflows with clear branching, disciplined commits, and reliable merging to improve collaboration and code quality across teams.

Core Features & Use Cases

  • Create and manage Git branches for feature development and hotfixes.
  • Enforce descriptive commit messages and maintain clean history.
  • Resolve merge conflicts and rebase branches to maintain a linear history.
  • Manage pull requests and code reviews using GitHub CLI or standard workflows.

Quick Start

Create a feature branch, commit with a clear message, and open a PR to merge into main.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What's the best way to manage Git branching and pull requests across a team?▼

The best way to manage Git branching and pull requests is to implement structured workflows for feature development, hotfixes, and code reviews. This ensures disciplined commits, reliable merging, and improved collaboration across teams.

How do I resolve merge conflicts and maintain a clean Git history?▼

To resolve merge conflicts and maintain a clean Git history, you can apply targeted rebase strategies alongside structured commit messaging. This approach keeps your project timeline linear and reduces collaborative friction.

How do I create a feature branch and open a PR using GitHub CLI?▼

You can create a feature branch, commit changes with a clear message, and open a pull request using GitHub CLI integration. This supports end-to-end Git workflows and streamlines code reviews.

When do I need to use a rebase strategy in my Git workflow?▼

You need to use a rebase strategy in your Git workflow when you want to maintain a linear project history. Rebasing integrates your branch changes sequentially, avoiding merge commits and simplifying conflict resolution before opening a pull request.

Why should I enforce descriptive commit messages in Git?▼

You should enforce descriptive commit messages in Git to maintain a clean history and improve code quality. Disciplined commits make it easier for teams to coordinate pull requests, review changes, and track feature development.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
oxieoxie

staging-deployment-phase

Automate staging deployment with auto-merge for merged pull requests.

Community
Intermediate
knckknckknckknck

go-style-guide

Standardize Go code quality and style across projects.

Community
Intermediate
jota-batutajota-batuta

git-workflow-and-versioning

Standardize trunk-based development and atomic commits for CI/CD workflows.

Community
Intermediate