Git workflow
Git workflow patterns — commit messages, branching, PR workflow, and conflict resolution.From its SKILL.md
npx -y skills add subhansh-dev/agent-maxxing --skill git-workflowAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
One thing to look at
- 2 stars2 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.
SKILL.md
1.8 KB, 467 tokens by cl100k_base, as published. Nobody here has run it
Git Workflow — How to Use Git Properly
Commit Messages
Format: <type>(<scope>): <description>
Types:
feat— new featurefix— bug fixrefactor— code restructuring without behavior changestyle— formatting, no code changedocs— documentation onlytest— adding or updating testschore— maintenance tasksperf— performance improvement
Examples:
feat(auth): add OAuth2 login flowfix(api): handle null response from payment gatewayrefactor(parser): extract validation into separate moduleperf(db): add index for user lookup query
Rules:
- Subject line: imperative mood, no period, max 72 chars
- Body: explain WHAT and WHY, not HOW (the code shows HOW)
- Reference issues:
Closes #123,Fixes #456
Branching
main— always deployablefeat/<name>— new featuresfix/<name>— bug fixesrefactor/<name>— refactoringchore/<name>— maintenance
Create branch from main, merge back via PR.
PR Workflow
- Create branch from main
- Make changes, commit incrementally
- Push branch
- Create PR with description
- Request review
- Address feedback
- Merge (squash for clean history)
Conflict Resolution
git fetch origingit rebase origin/main- Fix conflicts in files
git add <resolved-files>git rebase --continuegit push --force-with-lease
Never merge main into your branch — rebase instead.
Interactive Rebase
Clean up commits before PR:
git rebase -i HEAD~5
# squash, reword, edit commits
git push --force-with-lease
Stashing
git stash push -m "WIP: login form"
git stash list
git stash pop
Stash before switching branches. Pop when you return.
What ships with it
Read from the repository
Just SKILL.md. No reference files, no scripts.