Ejecuta cualquier Skill en Manus
con un clic

Ejecuta cualquier Skill en Manus con un clic

git-workflow

Estrellas7

Forks11

Actualizado20 de marzo de 2026 a las 02:48

Expert in Git workflows, branching strategies, commit conventions, and code review practices. Use when managing branches, creating commits, resolving conflicts, or following team git conventions.

Instalación

Instalar con Codex o Claude Copia este prompt, pégalo en Codex, Claude u otro asistente, y deja que revise la página de la skill y la instale por ti.

Ejecutar en Manus

Fuente

hemitoncode

hemitoncode/DailySAT

Abrir repositorio de GitHub Ver repositorios del creador

Descarga

Ejecutar en Manus

Ocupaciones relacionadasSOC

Basado en la clasificación ocupacional SOC

Desarrolladores de softwareOcupaciones informáticas y matemáticas·SOC 15-1252

SKILL.md

readonly

name	git-workflow
description	Expert in Git workflows, branching strategies, commit conventions, and code review practices. Use when managing branches, creating commits, resolving conflicts, or following team git conventions.

Git Workflow Agent

Expert guidance for Git operations and workflow best practices.

Project Conventions

Branch Strategy

main - Production-ready code
develop or feature branches - Development work
Feature branches naming: feat/description, fix/description, chore/description

Commit Message Format

Follow conventional commits:

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

<body>

<footer>

Types:

Type	Description
`feat`	New feature
`fix`	Bug fix
`docs`	Documentation changes
`style`	Code style (formatting, semicolons)
`refactor`	Code refactoring
`test`	Adding/updating tests
`chore`	Maintenance tasks

Examples:

feat(auth): add Google OAuth login
fix(practice): correct question answer display
docs(readme): update installation instructions
chore(deps): upgrade Next.js to 15.1.0

Pull Request Guidelines

PR Naming:

Use the same format as commit messages
feat: add new feature
fix: resolve issue with X

PR Description Template:

## Summary

Brief description of changes

## Changes

- List of specific changes made

## Testing

How was this tested?

## Screenshots (if UI changes)

Before/After images

Common Operations

Starting a New Feature

# Create feature branch
git checkout -b feat/my-new-feature

# Or from main
git checkout main && git pull origin main
git checkout -b feat/my-new-feature

Syncing with Main

# Fetch latest
git fetch origin

# Rebase onto main
git rebase origin/main

# Or merge main into branch
git merge origin/main

Committing Changes

# Stage specific files
git add src/app/page.tsx src/components/Button.tsx

# Stage all changes
git add .

# Commit with message
git commit -m "feat(auth): add sign-in component"

# Amend last commit (if not pushed)
git commit --amend -m "feat(auth): add sign-in component with validation"

Viewing History

# Recent commits
git log --oneline -10

# Changes in last commit
git show HEAD

# Search commits
git log --grep="fix" --oneline

# File history
git log --follow --oneline path/to/file.ts

Undoing Changes

# Unstage a file
git restore --staged path/to/file.ts

# Discard local changes to file
git checkout -- path/to/file.ts
# Or
git restore path/to/file.ts

# Revert a commit (creates new commit)
git revert HEAD

# Reset to previous commit (careful!)
git reset --soft HEAD~1  # Keep changes staged
git reset --mixed HEAD~1  # Keep changes unstaged
git reset --hard HEAD~1   # Discard changes (DANGEROUS)

Working with Remote

# Push new branch
git push -u origin feat/my-feature

# Push to update remote
git push

# Fetch and merge
git pull origin main

# Fetch only
git fetch origin

Conflict Resolution

During Rebase

# Start rebase
git rebase origin/main

# When conflict occurs, edit files to resolve
# Then:
git add <resolved-files>
git rebase --continue

# Or abort
git rebase --abort

During Merge

git merge origin/main

# Resolve conflicts in editor
# Then:
git add .
git commit -m "merge: resolve conflicts with main"

Conflict Markers

<<<<<<< HEAD
Your changes
=======
Incoming changes

> > > > > > > branch-name

Keep both changes, remove markers:

Combined changes here

Gitignore Best Practices

For this Next.js project, ensure these are ignored:

# Dependencies
node_modules/

# Build output
.next/
out/
build/

# Environment
.env
.env.local
.env.*.local

# IDE
.idea/
.vscode/

# OS
.DS_Store
Thumbs.db

# Logs
*.log
npm-debug.log*

# Testing
coverage/

# Misc
*.pem

Git Hooks (Husky)

This project uses Husky for pre-commit hooks. Config is in .husky/.

# Install Husky
pnpm prepare

# Skip hooks (not recommended)
git commit --no-verify -m "message"

Best Practices

Commit early, commit often - Small, focused commits
Write meaningful messages - Explain "why", not just "what"
Never force push to main - git push --force-with-lease if needed
Pull before starting work - Avoid merge conflicts
Use branches for all changes - Never commit directly to main
Review before pushing - Check what you're about to push

Más de este repositorio

mismo repositorio

database-dev

hemitoncode/DailySAT

Expert in MongoDB operations, database schema design, and data modeling for this SAT prep platform. Use when working with user data, practice questions, shop items, or any database-related tasks.

2026-03-207

frontend-design

hemitoncode/DailySAT

Expert in frontend design, UI/UX patterns, and creating visually appealing interfaces for this SAT prep platform. Use when building components, designing pages, or improving user experience.

2026-03-207

nextjs-dev

hemitoncode/DailySAT

Expert in Next.js 15, React 18, and TypeScript development. Use when building pages, API routes, components, or debugging Next.js applications. Handles App Router, Server Actions, middleware, and Next.js configuration.

2026-03-207

testing

hemitoncode/DailySAT

Expert in testing strategies, test setup, and best practices for this Next.js/React application. Use when writing tests, debugging test failures, or improving test coverage.

2026-03-207

name	git-workflow
description	Expert in Git workflows, branching strategies, commit conventions, and code review practices. Use when managing branches, creating commits, resolving conflicts, or following team git conventions.

Git Workflow Agent

Expert guidance for Git operations and workflow best practices.

Project Conventions

Branch Strategy

main - Production-ready code
develop or feature branches - Development work
Feature branches naming: feat/description, fix/description, chore/description

Commit Message Format

Follow conventional commits:

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

<body>

<footer>

Types:

Type	Description
`feat`	New feature
`fix`	Bug fix
`docs`	Documentation changes
`style`	Code style (formatting, semicolons)
`refactor`	Code refactoring
`test`	Adding/updating tests
`chore`	Maintenance tasks

Examples:

feat(auth): add Google OAuth login
fix(practice): correct question answer display
docs(readme): update installation instructions
chore(deps): upgrade Next.js to 15.1.0

Pull Request Guidelines

PR Naming:

Use the same format as commit messages
feat: add new feature
fix: resolve issue with X

PR Description Template:

## Summary

Brief description of changes

## Changes

- List of specific changes made

## Testing

How was this tested?

## Screenshots (if UI changes)

Before/After images

Common Operations

Starting a New Feature

# Create feature branch
git checkout -b feat/my-new-feature

# Or from main
git checkout main && git pull origin main
git checkout -b feat/my-new-feature

Syncing with Main

# Fetch latest
git fetch origin

# Rebase onto main
git rebase origin/main

# Or merge main into branch
git merge origin/main

Committing Changes

# Stage specific files
git add src/app/page.tsx src/components/Button.tsx

# Stage all changes
git add .

# Commit with message
git commit -m "feat(auth): add sign-in component"

# Amend last commit (if not pushed)
git commit --amend -m "feat(auth): add sign-in component with validation"

Viewing History

# Recent commits
git log --oneline -10

# Changes in last commit
git show HEAD

# Search commits
git log --grep="fix" --oneline

# File history
git log --follow --oneline path/to/file.ts

Undoing Changes

# Unstage a file
git restore --staged path/to/file.ts

# Discard local changes to file
git checkout -- path/to/file.ts
# Or
git restore path/to/file.ts

# Revert a commit (creates new commit)
git revert HEAD

# Reset to previous commit (careful!)
git reset --soft HEAD~1  # Keep changes staged
git reset --mixed HEAD~1  # Keep changes unstaged
git reset --hard HEAD~1   # Discard changes (DANGEROUS)

Working with Remote

# Push new branch
git push -u origin feat/my-feature

# Push to update remote
git push

# Fetch and merge
git pull origin main

# Fetch only
git fetch origin

Conflict Resolution

During Rebase

# Start rebase
git rebase origin/main

# When conflict occurs, edit files to resolve
# Then:
git add <resolved-files>
git rebase --continue

# Or abort
git rebase --abort

During Merge

git merge origin/main

# Resolve conflicts in editor
# Then:
git add .
git commit -m "merge: resolve conflicts with main"

Conflict Markers

<<<<<<< HEAD
Your changes
=======
Incoming changes

> > > > > > > branch-name

Keep both changes, remove markers:

Combined changes here

Gitignore Best Practices

For this Next.js project, ensure these are ignored:

# Dependencies
node_modules/

# Build output
.next/
out/
build/

# Environment
.env
.env.local
.env.*.local

# IDE
.idea/
.vscode/

# OS
.DS_Store
Thumbs.db

# Logs
*.log
npm-debug.log*

# Testing
coverage/

# Misc
*.pem

Git Hooks (Husky)

This project uses Husky for pre-commit hooks. Config is in .husky/.

# Install Husky
pnpm prepare

# Skip hooks (not recommended)
git commit --no-verify -m "message"

Best Practices

Commit early, commit often - Small, focused commits
Write meaningful messages - Explain "why", not just "what"
Never force push to main - git push --force-with-lease if needed
Pull before starting work - Avoid merge conflicts
Use branches for all changes - Never commit directly to main
Review before pushing - Check what you're about to push