Git control

Skill tuliosousapro/SaaS-blueprint/skills/git-control

BRAINIAC - SaaS Blueprint, NOT an APP. It's a comprehensive playbook and operating system designed for building, launching, and scaling a SaaS APP covering from MVP to Mass Scale. It is structured as a chronological and functional roadmap, containing over 80 specialized directories, each with its own PLAYBOOK.md.

Install

npx -y skills add tuliosousapro/SaaS-blueprint --skill git-control

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

One thing to look at

3 stars3 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its author says it does

Copied from the file, not written here

Standardizes git operations, branch management, and disaster recovery. Use when committing, branching, or resolving conflicts. For commit formatting, see conventional-commits.

SKILL.md

2.2 KB, as published. Nobody here has run it

Git Control Skill

When to Use

Whenever performing version control operations.
When creating new features, fixing bugs, or managing releases.
For resolving merge conflicts or recovering from mistakes.

1. Core Workflow

Branching Strategy

Main Branch: Production-ready code only.
Feature Branches: feat/[feature-name] for new functionality.
Bug Fix Branches: fix/[bug-name] for corrections.
Hotfix Branches: hotfix/[issue] for urgent production fixes.

Staging & Committing

Always follow the Conventional Commits skill.
Stage only relevant changes: git add <file> (avoid git add . unless necessary).
Review changes before committing: git diff --staged.

2. Common Operations

Starting Work

git checkout main
git pull origin main
git checkout -b feat/my-new-feature

Synchronizing

git fetch --all
git pull origin [branch-name]
git push origin [branch-name]

Merging & Rebasing

Merge: Use for combining long-lived branches.
Rebase: Use to keep feature branches up-to-date with main and maintain a clean history.
```
git checkout feat/my-feature
git rebase main
```

3. Advanced Git Mastery

Conflict Resolution

Identify files: git status.
Edit files to resolve <<<<, ====, >>>> markers.
Stage resolved files: git add <file>.
Continue: git commit or git rebase --continue.

Disaster Recovery

Undo last commit (keep changes): git reset --soft HEAD~1.
Undo last commit (discard changes): git reset --hard HEAD~1.
Find lost commits: git reflog.
Revert a specific commit: git revert <commit-hash>.

Stashing

Save work temporarily: git stash push -m "work in progress".
Retrieve work: git stash pop.

4. Quality Gates

No merge commits on feature branches (prefer rebase).
Each commit must pass linting and tests.
Pull requests must be clear and focus on a single objective.