skills.rest
tgmarinho
tgmarinhoCOMMUNITY
Explore all skills by this author →
Website𝕏@tgmarinhoGitHub

git-workflow-and-versioning

Manage Git branching, commits, and worktrees for reversible code changes.

Updated Jul 2, 2026
Search Tags:#git#workflow#version control#code management#commit discipline
One-click install
npx skills add https://github.com/tgmarinho/agent-super-powers-matt-pocock-skills-comparasions --skill git-workflow-and-versioning-tgmarinho
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow-and-versioning
Source: https://github.com/tgmarinho/agent-super-powers-matt-pocock-skills-comparasions/tree/main/upstream-snapshots/agent-skills/skills/git-workflow-and-versioning
Command: npx skills add https://github.com/tgmarinho/agent-super-powers-matt-pocock-skills-comparasions --skill git-workflow-and-versioning-tgmarinho

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill helps streamline your git workflow, making code changes manageable, reviewable, and reversible.

Core Features & Use Cases

  • Trunk-Based Development: Keep the 'main' branch deployable at all times, with short-lived feature branches.
  • Commit Best Practices: Implement atomic commits, descriptive messages, and keep concerns separate.
  • Branching Strategy: Use feature branches for new features, fix branches for bug fixes, and chore branches for tooling changes.
  • Working with Worktrees: Run multiple branches in parallel without interfering using git worktrees.
  • Save Point Pattern: Commit early and often to maintain save points, allowing easy rollback if needed.
  • Pre-Commit Hygiene: Check for changes, secrets, and run tests before each commit.
  • Handling Generated Files: Commit only the necessary generated files, and manage build artifacts and environment files with .gitignore.
  • Debugging with Git: Use git tools for debugging, bisecting, and tracking changes.

Quick Start

Use the git-workflow-and-versioning skill to start a new feature branch for your project named 'new-feature'.

Frequently Asked Questions about git-workflow-and-versioning

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

FAQPage Schema
What is the best way to structure a git workflow for continuous integration?▼

A structured git workflow uses trunk-based development to keep the main branch deployable at all times. It relies on short-lived feature branches for new work, ensuring changes remain manageable and reversible.

How do I manage parallel feature branches without interfering with my current work?▼

You can use git worktrees to run multiple branches in parallel without interfering. This allows you to maintain separate working directories for different features simultaneously from a single repository.

How do I keep my git commits clean and easy to review?▼

To keep git commits clean, implement atomic commits with descriptive messages and separate concerns. Committing early and often creates save points, allowing easy rollback if needed during development.

What should I check before committing code changes in version control?▼

Before committing code changes in version control, check for unintended modifications, scan for secrets, and run tests. This pre-commit hygiene ensures only valid, secure code enters the repository history.

Can I use this git branching strategy for fixing bugs and tooling changes?▼

Yes, this git branching strategy supports fix branches for bug fixes and chore branches for tooling changes. It applies disciplined branching rules to keep software development projects organized and reversible.

How do I handle generated files and build artifacts in version control?▼

To handle generated files in version control, commit only necessary generated files and manage build artifacts and environment files using .gitignore. This prevents unnecessary clutter in the repository history.

Related Skills

Explore More Software Engineering Skills→
mikersaysmikersays

issue-init

Initialize a structured issue tracking system in a Git repository.

Community
Intermediate
zizzfizzixzizzfizzix

code-review

Automate code review for architectural, security, and quality compliance.

Community
Advanced
jordanhubbardjordanhubbard
9

requesting-code-review

Automate pre-commit code review with static analysis and security scans.

Community
Advanced
FlexNetOSFlexNetOS

github-multi-repo

Orchestrate multi-repository projects with AI swarm coordination and dependency synchronization.

Official
Advanced