git-advanced

Git Advanced Skill

TEMPLATE: This skill uses {{PLACEHOLDER}} tokens. Replace with your project values before use.

Purpose

Provide guidance for advanced git operations with safety considerations. This project uses a rebase-first workflow with linear history -- understand these patterns to avoid breaking the codebase.

When This Skill Applies

• Rebasing feature branches onto dev
• Using git bisect to find bugs
• Cherry-picking commits between branches
• Resolving complex merge conflicts
• Recovering from git mistakes

Stop-the-Line Conditions

FORBIDDEN Operations

# FORBIDDEN: Force push to protected branches
git push --force origin dev     # NEVER
git push --force origin master               # NEVER

# FORBIDDEN: Merge commits on dev branch
git merge feature-branch                     # Use rebase-and-merge PR strategy

# FORBIDDEN: Skip pre-commit hooks
git commit --no-verify                       # Hooks exist for a reason

# FORBIDDEN: Rewriting shared history
git rebase -i HEAD~5 && git push --force     # If already pushed

SAFE Operations

# SAFE: Force-with-lease on your feature branch
git push --force-with-lease origin ASP-XXX-feature

# SAFE: Interactive rebase before first push
git rebase -i origin/dev

# SAFE: Force push after conflict resolution on your own branch
git rebase origin/dev && git push --force-with-lease origin ASP-XXX-feature

Rebase Workflow (Standard)

Before Creating PR

# 1. Fetch latest changes
git fetch origin dev

# 2. Rebase onto latest
git rebase origin/dev

# 3. If conflicts, resolve them
git status                   # See conflicted files
# ... edit files to resolve ...
git add <resolved-files>
git rebase --continue

# 4. Push with force-with-lease
git push --force-with-lease origin ASP-XXX-feature

During PR Review (After Feedback)

# 1. Make requested changes
git add . && git commit -m "fix: address PR feedback [ASP-XXX]"

# 2. Fetch and rebase again
git fetch origin dev
git rebase origin/dev

# 3. Push update
git push --force-with-lease origin ASP-XXX-feature