skills.rest
Elric412
Elric412COMMUNITY
Explore all skills by this author →
GitHub

managing-git

Manage Git branching, commits, pull requests, and rebasing workflows.

Updated Aug 23, 2026
Search Tags:#git#branching#pull-request#commit-history#conventional-commits#rebasing#merge-conflict
One-click install
npx skills add https://github.com/Elric412/Leica-cam --skill managing-git-elric412
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: managing-git
Source: https://github.com/Elric412/Leica-cam/tree/main/.agents/skills/managing-git
Command: npx skills add https://github.com/Elric412/Leica-cam --skill managing-git-elric412

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill eliminates confusion and inconsistency in team Git workflows by providing clear, repeatable guidance for branching, commits, rebasing, pull requests, and conflict resolution so teams can deliver features reliably.

Core Features & Use Cases

  • Branching & Naming: Standardized branch naming patterns for features, fixes, chores, and release branches to improve traceability.
  • Commit Hygiene: Conventional commit format, atomic commits, and commit validation checks to keep history clean and automatable.
  • PR & Review Workflow: Checklist-driven PR creation, size guidance, and merge readiness criteria to speed up reviews and reduce regressions.
  • Advanced Recovery: Guidance for interactive rebases, cherry-picks, bisecting regressions, safe amend/revert strategies, and stash usage for interrupted work.
  • Use Case: A developer preparing a feature branch can follow the checklist to create a branch, produce atomic commits, rebase on main, open a PR, address feedback, and safely merge.

Quick Start

Create a feature branch from main, make atomic Conventional Commits, rebase on the latest main, push the branch, and open a pull request for review.

Frequently Asked Questions about managing-git

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

FAQPage Schema
How do I resolve a merge conflict during a pull request review?▼

Resolve a merge conflict by rebasing your feature branch on the latest main, addressing conflicting file markers, and completing safe push practices. This Skill provides guidance for interactive rebases and safe conflict resolution during pull requests.

What is the best way to structure conventional commits for team-based feature development?▼

Conventional commits require atomic commit formatting and validation checks to keep history clean and automatable. This Skill enforces commit hygiene by applying standardized conventional commit formats for team-based software projects.

How do I perform an interactive rebase to clean up commit history before merging?▼

Perform an interactive rebase to clean up commit history by following provided commands for interactive history cleanup, cherry-picks, and safe amend strategies. This ensures your feature branch history is clean before pull request creation.

Does this Skill support standard branch naming conventions for feature and release branches?▼

Yes, this Skill supports standard branch naming conventions for features, fixes, chores, and release branches. It improves traceability in team-based software projects by enforcing standardized branch naming patterns for feature development.

Can I use this for pull request creation and review readiness in a team workflow?▼

Yes, you can use this for pull request creation and review readiness through checklist-driven PR creation, size guidance, and merge readiness criteria. It speeds up reviews and reduces regressions in collaborative Git workflows.

How do I safely recover or revert interrupted work using a git stash?▼

Safely recover interrupted work by utilizing stash usage guidance, bisecting regressions, and safe amend or revert strategies. This Skill provides advanced recovery commands for managing version control operations during feature development.

Related Skills

Explore More Software Engineering Skills→
okbest2024okbest2024

git-essentials

Automate Git repository setup, branching, merging, and remote synchronization.

Community
Intermediate
mr-daedaliummr-daedalium
107

land-and-deploy

Merge PRs, trigger deployment, and verify canary health in CI/CD pipelines.

Community
Advanced
xxihxxih
1

springboot-verification

Validate Spring Boot applications with build, static analysis, coverage, and security scans.

Community
Advanced
motlinmotlin
14

git-workflow

Standardize git commits, rebasing, conflict resolution, and branch management.

Community
Basic