skills.rest
imMamdouhaboammar
imMamdouhaboammarCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

agency-git-workflow-master

Guides Git branching strategies, conventional commits, rebasing, and worktree workflows.

Updated Jul 27, 2026
Search Tags:#git#code review#version control#worktrees#conventional commits#branching#rebase
One-click install
npx skills add https://github.com/imMamdouhaboammar/Mimera --skill agency-git-workflow-master-immamdouhaboammar
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: agency-git-workflow-master
Source: https://github.com/imMamdouhaboammar/Mimera/tree/main/.agents/skills/engineering-git-workflow-master
Command: npx skills add https://github.com/imMamdouhaboammar/Mimera --skill agency-git-workflow-master-immamdouhaboammar

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams struggle with messy commit histories, unclear branching strategies, and risky Git operations like force pushes and rebases. This Skill provides expert guidance on maintaining clean, navigable repositories and choosing the right workflow for your team. ## Core Features & Use Cases - Branching Strategy Guidance: Recommends trunk-based development or Git Flow based on team size and release cadence, with visual diagrams. - Commit Hygiene: Enforces atomic commits and conventional commit formats (feat, fix, chore, docs, refactor, test). - Safe Advanced Operations: Provides safe patterns for interactive rebase, worktrees, cherry-pick, bisect, and force pushes using --force-with-lease. - Use Case: A developer finishing a feature branch can follow the guided workflow to rebase on the latest main, squash fixup commits, push safely, and merge with a clean history. ## Quick Start Ask the agent to help you clean up your current feature branch with an interactive rebase before opening a pull request.

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 clean up commits before a pull request?▼

Fetch the latest main branch, then run an interactive rebase with git rebase -i origin/main to squash fixup commits and reword messages. Push the result with git push --force-with-lease to safely update your branch.

What is the difference between trunk-based development and Git Flow?▼

Trunk-based development uses short-lived feature branches merged frequently into an always-deployable main branch, suiting most teams. Git Flow uses separate develop and release branches, fitting projects with versioned release cycles.

Is it safe to force push to a shared branch?▼

Never force-push shared branches, as it rewrites history others depend on. For your own feature branches, use git push --force-with-lease, which fails if someone else has pushed changes you have not seen.

When should I use git worktree instead of branches?▼

Use git worktree add when you need to work on multiple branches simultaneously without stashing or switching contexts. Each worktree gets its own directory, letting you run builds or tests in parallel.

What are conventional commits and why use them?▼

Conventional commits prefix messages with types like feat:, fix:, chore:, docs:, refactor:, and test:. They make history scannable, enable automated changelog generation, and support semantic versioning automation in CI pipelines.

Related Skills

Explore More Software Engineering Skills→
Coverage-CreativesCoverage-Creatives

Git Configuration

Automate Git repository setup with standardized structures, hooks, and commit conventions.

Official
Advanced
Tonybleything76Tonybleything76

Changelog Generator

Generate changelog entries from Git commit history using Conventional Commits.

Community
Advanced
azmiariffarisazmiariffaris

requesting-code-review

Automate pre-commit verification with static security scans and quality gates.

Community
Advanced
PostHogPostHog
713

stacking-prs

Create and manage GitHub native stacked PRs with the gh stack CLI.

Official
Advanced