Run any Skill in Manus with one click

git-workflow

Stars15

Forks2

UpdatedFebruary 27, 2026 at 02:53

Smart git operations including conventional commits, PR creation, branch management, and conflict resolution. Activates for "commit", "create PR", "push", "merge", "resolve conflict", "git" operations.

Installation

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

Run Skill in Manus

Source

abdullah1854

abdullah1854/MCPGateway

View GitHub Repository View Creator Repositories

Download

Run Skill in Manus

Related occupationsSOC

Based on SOC occupation classification

Computer Occupations, All OtherComputer and Mathematical Occupations·SOC 15-1299

Software DevelopersSOC 15-1252

File Explorer

4 files

SKILL.md

readonly

name	git-workflow
description	Smart git operations including conventional commits, PR creation, branch management, and conflict resolution. Activates for "commit", "create PR", "push", "merge", "resolve conflict", "git" operations.
allowed-tools	["Bash","Read","Grep","Glob","Write"]

Git Workflow Protocol

When This Skill Activates

"Commit this", "commit changes", "save changes"
"Create PR", "open pull request", "push to remote"
"Merge", "rebase", "resolve conflicts"
Any git-related operations

Commit Message Convention

Format

<type>(<scope>): <subject>

<body>

<footer>

Types

Type	Use For
`feat`	New feature
`fix`	Bug fix
`refactor`	Code restructuring (no behavior change)
`perf`	Performance improvement
`docs`	Documentation only
`test`	Adding/fixing tests
`chore`	Build, deps, config changes
`style`	Formatting (no code change)

Before Committing - Always Run:

# 1. See what's changed
git status
git diff --staged

# 2. Check recent commit style
git log --oneline -10

# 3. Verify no secrets
git diff --staged | grep -i -E "(password|secret|key|token|api_key)" || echo "No secrets found"

Commit Message Examples

Good:

feat(auth): add OAuth2 login with Google

- Implement GoogleAuthProvider with PKCE flow
- Add /api/auth/google callback endpoint
- Store refresh tokens in encrypted session

Closes #123

Bad:

fixed stuff
update
wip

Pull Request Workflow

Before Creating PR:

# 1. Ensure branch is up to date
git fetch origin main
git rebase origin/main

# 2. Run tests
npm test

# 3. Check for lint errors
npm run lint

# 4. Review your own changes
git diff origin/main...HEAD

PR Title Format

Same as commit: type(scope): description

PR Body Template

## Summary
[1-3 bullet points of what this PR does]

## Changes
- [Specific change 1]
- [Specific change 2]

## Testing
- [ ] Unit tests pass
- [ ] Manual testing done
- [ ] Edge cases covered

## Screenshots (if UI change)
[Before/After images]

## Related Issues
Closes #XXX

PR Creation Command

gh pr create --title "feat(scope): description" --body "$(cat <<'EOF'
## Summary
- Change 1
- Change 2

## Test Plan
- [ ] Tests pass
- [ ] Manual verification done

---
Generated with Claude Code
EOF
)"

Branch Naming

feature/short-description
fix/issue-number-description
refactor/what-is-being-refactored

Conflict Resolution

Step-by-Step:

# 1. Update main
git fetch origin main

# 2. Start rebase
git rebase origin/main

# 3. When conflicts occur:
# - Open conflicted files
# - Look for <<<<<<< markers
# - Keep correct version, remove markers
# - Stage resolved files
git add <resolved-file>

# 4. Continue rebase
git rebase --continue

# 5. If stuck, abort and try merge instead
git rebase --abort
git merge origin/main

Conflict Markers

<<<<<<< HEAD
Your changes
=======
Their changes
>>>>>>> branch-name

Safety Rules

NEVER force push to main/master
NEVER commit .env files or secrets
ALWAYS review diff before committing
ALWAYS run tests before pushing
NEVER use git add . without reviewing status first

Quick Reference

# Undo last commit (keep changes)
git reset --soft HEAD~1

# Discard all local changes
git checkout -- .

# See what would be pushed
git log origin/main..HEAD

# Interactive rebase last N commits
git rebase -i HEAD~N

More from this repository

same repository

frontend-build

abdullah1854/MCPGateway

Production-grade frontend development with distinctive design. Activates for "build UI", "create component", "landing page", "dashboard", "form", "responsive", "tailwind", "frontend", "design", "React", "Next.js" requests.

2026-02-2715

test-driven-fix

abdullah1854/MCPGateway

Test-first debugging loop that reproduces bugs with failing tests, then iterates until tests pass. Activates for "write a test first", "test-driven fix", "TDD fix", "reproduce with test", "make it pass", or when fixing bugs that have an existing test suite.

2026-02-2515

debugging

abdullah1854/MCPGateway

Systematic debugging protocol for finding and fixing bugs. Activates for "debug", "fix bug", "not working", "error", "broken", "issue", "fails", "crash", "undefined", "null" problems. Hardened against 169 sessions of real-world friction data.

2026-02-2515

seo-recovery

abdullah1854/MCPGateway

SEO traffic recovery protocol for diagnosing and fixing indexing drops, canonical mismatches, hreflang bugs, and toxic sitemaps. Integrates with Google Search Console via MCP Gateway. Includes Hostinger deployment awareness for OPcache/CDN friction. Activates for "SEO", "traffic drop", "indexing", "canonical", "hreflang", "sitemap", "search console", "GSC", "crawl errors", "deindexed", "organic traffic".

2026-02-2515

hostinger-deploy

abdullah1854/MCPGateway

Hostinger-specific deployment protocol handling OPcache, CDN caching, and hPanel Git mechanism. Activates for "deploy to hostinger", "hostinger", "redeploy", "publish website", "push to production" when target is Hostinger.

2026-02-1015

code-review

abdullah1854/MCPGateway

Comprehensive code review for security, performance, and maintainability. Activates when asked to "review code", "check this code", "audit", "find bugs", "security review", or when reviewing PRs or diffs.

2026-01-1815

name	git-workflow
description	Smart git operations including conventional commits, PR creation, branch management, and conflict resolution. Activates for "commit", "create PR", "push", "merge", "resolve conflict", "git" operations.
allowed-tools	["Bash","Read","Grep","Glob","Write"]

Git Workflow Protocol

When This Skill Activates

"Commit this", "commit changes", "save changes"
"Create PR", "open pull request", "push to remote"
"Merge", "rebase", "resolve conflicts"
Any git-related operations

Commit Message Convention

Format

<type>(<scope>): <subject>

<body>

<footer>

Types

Type	Use For
`feat`	New feature
`fix`	Bug fix
`refactor`	Code restructuring (no behavior change)
`perf`	Performance improvement
`docs`	Documentation only
`test`	Adding/fixing tests
`chore`	Build, deps, config changes
`style`	Formatting (no code change)

Before Committing - Always Run:

# 1. See what's changed
git status
git diff --staged

# 2. Check recent commit style
git log --oneline -10

# 3. Verify no secrets
git diff --staged | grep -i -E "(password|secret|key|token|api_key)" || echo "No secrets found"

Commit Message Examples

Good:

feat(auth): add OAuth2 login with Google

- Implement GoogleAuthProvider with PKCE flow
- Add /api/auth/google callback endpoint
- Store refresh tokens in encrypted session

Closes #123

Bad:

fixed stuff
update
wip

Pull Request Workflow

Before Creating PR:

# 1. Ensure branch is up to date
git fetch origin main
git rebase origin/main

# 2. Run tests
npm test

# 3. Check for lint errors
npm run lint

# 4. Review your own changes
git diff origin/main...HEAD

PR Title Format

Same as commit: type(scope): description

PR Body Template

## Summary
[1-3 bullet points of what this PR does]

## Changes
- [Specific change 1]
- [Specific change 2]

## Testing
- [ ] Unit tests pass
- [ ] Manual testing done
- [ ] Edge cases covered

## Screenshots (if UI change)
[Before/After images]

## Related Issues
Closes #XXX

PR Creation Command

gh pr create --title "feat(scope): description" --body "$(cat <<'EOF'
## Summary
- Change 1
- Change 2

## Test Plan
- [ ] Tests pass
- [ ] Manual verification done

---
Generated with Claude Code
EOF
)"

Branch Naming

feature/short-description
fix/issue-number-description
refactor/what-is-being-refactored

Conflict Resolution

Step-by-Step:

# 1. Update main
git fetch origin main

# 2. Start rebase
git rebase origin/main

# 3. When conflicts occur:
# - Open conflicted files
# - Look for <<<<<<< markers
# - Keep correct version, remove markers
# - Stage resolved files
git add <resolved-file>

# 4. Continue rebase
git rebase --continue

# 5. If stuck, abort and try merge instead
git rebase --abort
git merge origin/main

Conflict Markers

<<<<<<< HEAD
Your changes
=======
Their changes
>>>>>>> branch-name

Safety Rules

NEVER force push to main/master
NEVER commit .env files or secrets
ALWAYS review diff before committing
ALWAYS run tests before pushing
NEVER use git add . without reviewing status first

Quick Reference

# Undo last commit (keep changes)
git reset --soft HEAD~1

# Discard all local changes
git checkout -- .

# See what would be pushed
git log origin/main..HEAD

# Interactive rebase last N commits
git rebase -i HEAD~N