skills.rest
omeraltn
omeraltnCOMMUNITY
Explore all skills by this author →
GitHub

agency-git-workflow-master

Enforce conventional commits and safe Git workflows across team repositories.

Updated Apr 11, 2026
Search Tags:#git#worktrees#branching#ci#version-control#conventional-commits#rebasing
One-click install
npx skills add https://github.com/omeraltn/ice_cream_website_testing --skill agency-git-workflow-master-omeraltn
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: agency-git-workflow-master
Source: https://github.com/omeraltn/ice_cream_website_testing/tree/main/.antigravity/agency-git-workflow-master
Command: npx skills add https://github.com/omeraltn/ice_cream_website_testing --skill agency-git-workflow-master-omeraltn

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps teams maintain clear, auditable Git history, avoid merge conflicts, and recover from broken histories by teaching and enforcing safe branching, commit, and CI practices.

Core Features & Use Cases

  • Atomic commits & conventional messages: Advice on creating small, focused commits and using conventional commit types for traceability.
  • Branching strategies: Guidance on choosing trunk-based or Git Flow patterns and naming conventions for predictable releases.
  • Advanced Git operations: Step-through workflows for interactive rebase, worktrees, bisect, cherry-pick, and safe force-push techniques.
  • CI integration & recovery: Recommendations for branch protection, CI-friendly merges, and recovery steps using reflog and bisect to restore lost work.
  • Use Case: Prepare a feature branch for PR by squashing fixups, rebasing onto the latest main, ensuring tests pass locally, and pushing safely for CI validation.

Quick Start

Ask the agent to prepare a feature branch for review by interactively rebasing onto origin/main, squashing fixups, running local tests, and pushing with --force-with-lease.

Frequently Asked Questions about agency-git-workflow-master

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

FAQPage Schema
How do I squash fixup commits and rebase a feature branch onto main before a pull request?▼

Git worktrees allow you to manage multiple branches simultaneously by linking separate working directories to a single repository, enabling parallel feature development without stashing or cloning overhead.

What is the best way to recover lost commits after a bad rebase or force push?▼

Recover lost work by using the git reflog to find the previous HEAD state and git bisect to identify broken commits, allowing you to restore the correct history point and safely reset your branch.

How do conventional commits improve CI pipelines and team collaboration?▼

Conventional commits standardize commit messages with specific types like feat or fix, providing automated traceability for CI pipelines and making it easier for teams to generate changelogs and track release-impacting changes.

When should I use git bisect versus cherry-pick in a release workflow?▼

Use git bisect to binary search commit history and locate a specific regression, while git cherry-pick applies specific commit changes from one branch to another for targeted hotfixes during release workflows.

Can I enforce CI-friendly branch protection rules with trunk-based development?▼

Yes, trunk-based development integrates with CI-friendly branch protection by requiring successful builds before merging short-lived branches, ensuring main remains stable and reducing complex merge conflicts.

Related Skills

Explore More Software Engineering Skills→
adiytharpansaadiytharpansa

Git

Manage and repair Git repositories with commits, branches, merges, and rebases.

Community
Advanced
AlejocabezaAlejocabeza
1

changelog-automation

Generate Keep a Changelog changelogs from commits, PRs, and releases.

Community
Advanced
nashgaonashgao
3

Git Push, Pull & Fetch Operations

Manage Git push, pull, and fetch operations with safety checks.

Community
Advanced
pohlai88pohlai88

monorepo-workflows

Coordinates builds, tests, releases and publishing across Turborepo-based, pnpm-managed monorepos using Changesets for version management.

Community
Advanced