Menu
Guide complex Git operations including interactive rebase, cherry-pick, conflict resolution, reflog recovery, and history rewriting with safety warnings and step-by-step guidance.
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.
Based on SOC occupation classification
| name | git-workflow-helper |
| description | Guide complex Git operations including interactive rebase, cherry-pick, conflict resolution, reflog recovery, and history rewriting with safety warnings and step-by-step guidance. |
Guide complex Git operations: interactive rebase, cherry-pick, conflict resolution, reflog recovery, history rewriting. Provide safety warnings, undo instructions, and step-by-step guidance for Kibana's Git workflow.
# Show commits to be rebased
git log --oneline origin/main..HEAD
# Count commits
git rev-list --count origin/main..HEAD
# Check for merge commits (can't rebase)
git log --oneline --merges origin/main..HEAD
Decision Tree:
git rebase -p or re-create branch# Start interactive rebase
git rebase -i origin/main
# Editor opens with commit list:
# pick abc123 feat: add feature X
# pick def456 fix: typo in test
# pick ghi789 chore: update deps
# Edit to squash:
# pick abc123 feat: add feature X
# squash def456 fix: typo in test
# squash ghi789 chore: update deps
# Save and exit
# New editor opens for combined commit message
# Edit message, save, and exit
# If conflicts occur:
# Fix conflicts in files
git add <resolved-files>
git rebase --continue
# If rebase goes wrong:
git rebase --abort
Safety Checks:
git statusgit fetch origingit log --mergesgit branch backup-branch-name# Squash last N commits
git rebase -i HEAD~5
# In editor: change 'pick' to 'squash' for all but first
pick abc123 feat: initial work
squash def456 fix: review feedback
squash ghi789 fix: lint errors
squash jkl012 fix: type errors
squash mno345 chore: update tests
# Result: 1 clean commit
# Fix commit messages
git rebase -i HEAD~3
# In editor: change 'pick' to 'reword'
reword abc123 fix: typo in commit message
pick def456 feat: feature X
pick ghi789 test: add tests
# New editor opens for each 'reword'
# Update message, save, exit
# Reorder commits (move fix before feature)
git rebase -i HEAD~3
# Before:
# pick abc123 feat: feature X
# pick def456 fix: bug Y
# pick ghi789 feat: feature Z
# After (drag lines):
# pick def456 fix: bug Y
# pick abc123 feat: feature X
# pick ghi789 feat: feature Z
# Save and exit
# Remove commits from history
git rebase -i HEAD~3
# In editor: change 'pick' to 'drop' or delete line
pick abc123 feat: feature X
drop def456 wip: debugging code
pick ghi789 test: add tests
# Save and exit
// File: src/core/server/http_server.ts
<<<<<<< HEAD (current - your base branch)
export class HttpServer {
private port = 5601;
=======
export class HttpServer {
private port = 9200;
>>>>>>> abc123 (incoming - your commit)
}
Resolution Strategy:
# See conflicted files
git status
# Open file in editor
# Look for <<<<<<< ======= >>>>>>> markers
# Edit to resolve (remove markers)
# Mark as resolved
git add src/core/server/http_server.ts
# Continue rebase
git rebase --continue
# If more conflicts, repeat
# If stuck, abort
git rebase --abort
# Keep all from base branch (theirs during rebase)
git checkout --theirs src/core/server/http_server.ts
git add src/core/server/http_server.ts
# Keep all from your commit (ours during rebase)
git checkout --ours src/core/server/http_server.ts
git add src/core/server/http_server.ts
# Use merge tool
git mergetool
# Find commit to cherry-pick
git log --oneline --grep="fix: bug Y"
# Cherry-pick to current branch
git cherry-pick abc123
# If conflicts:
# Resolve conflicts
git add <resolved-files>
git cherry-pick --continue
# If cherry-pick goes wrong:
git cherry-pick --abort
# Cherry-pick range (exclusive start)
git cherry-pick abc123..ghi789
# Cherry-pick multiple specific commits
git cherry-pick abc123 def456 ghi789
# Cherry-pick with new commit message
git cherry-pick abc123 --edit
# Merge commits have multiple parents
# Must specify which parent to use
# Show merge commit parents
git show --pretty=format:"%h %p" abc123
# Cherry-pick merge (use parent 1)
git cherry-pick -m 1 abc123
# If unsure which parent:
# Parent 1 = main branch
# Parent 2 = feature branch
# Cherry-pick without committing (stage only)
git cherry-pick -n abc123
# Modify staged changes
# Edit files as needed
# Commit with custom message
git commit -m "fix: adapted cherry-pick from main"
Conflict type:
Conflict scope:
Resolution strategy:
# List conflicted files
git status | grep "both modified"
# See conflict markers in file
git diff --name-only --diff-filter=U
# Show detailed conflict diff
git diff src/core/server/http_server.ts
# See commits that touched this file (yours)
git log --oneline HEAD..origin/main -- src/core/server/http_server.ts
# See commits that touched this file (theirs)
git log --oneline origin/main..HEAD -- src/core/server/http_server.ts
# Show file before conflict
git show HEAD:src/core/server/http_server.ts
git show origin/main:src/core/server/http_server.ts
# Option 1: Manual edit
# Open file, remove markers, keep correct code
# Option 2: Keep one side entirely
git checkout --ours src/core/server/http_server.ts
# or
git checkout --theirs src/core/server/http_server.ts
# Option 3: Use merge tool
git mergetool
# Stage resolved file
git add src/core/server/http_server.ts
# Verify no conflict markers remain
grep -r "<<<<<<< \|======= \|>>>>>>>" src/
# Type check
yarn test:type_check --project src/core/tsconfig.json
# Lint
node scripts/eslint src/core/server/http_server.ts
# Test
yarn test:jest src/core/server/http_server.test.ts
# Continue rebase
git rebase --continue
# Or continue cherry-pick
git cherry-pick --continue
# Or commit merge
git commit
# Show reflog (last 30 entries)
git reflog -30
# Example output:
# abc123 HEAD@{0}: reset: moving to origin/main
# def456 HEAD@{1}: commit: feat: feature X <-- LOST COMMIT
# ghi789 HEAD@{2}: commit: fix: bug Y
# Recover lost commit
git cherry-pick def456
# Or reset to lost commit
git reset --hard def456
# Oops, did 'git reset --hard' by mistake
# Find commit before reset
git reflog | grep "reset"
# abc123 HEAD@{0}: reset: moving to origin/main
# def456 HEAD@{1}: commit: feat: feature X <-- WANT THIS
# Recover
git reset --hard def456
# Or create new branch from lost commit
git checkout -b recovery-branch def456
# Oops, deleted branch with 'git branch -D my-feature'
# Find last commit on deleted branch
git reflog | grep "my-feature"
# abc123 HEAD@{5}: checkout: moving from my-feature to main
# Recreate branch
git checkout -b my-feature abc123
# Oops, rebase messed up history
# Find commit before rebase
git reflog | grep "rebase"
# def456 HEAD@{0}: rebase finished: returning to refs/heads/my-branch
# abc123 HEAD@{10}: rebase: checkout origin/main <-- BEFORE REBASE
# Reset to before rebase
git reset --hard abc123
# Or create backup branch
git branch backup-before-rebase abc123
# Label PR with backport label
# Example: backport:8.x, backport:7.17
# Kibana bot creates backport PR automatically
# Review and merge backport PR
# Step 1: Fetch target branch
git fetch origin 8.x
# Step 2: Create backport branch
git checkout -b backport-12345-to-8.x origin/8.x
# Step 3: Cherry-pick commits from PR
git log --oneline origin/main ^origin/8.x | grep "#12345"
# abc123 fix: bug Y (#12345)
# def456 test: add test for bug Y (#12345)
git cherry-pick abc123 def456
# Step 4: Resolve conflicts (if any)
# Follow conflict resolution steps above
# Step 5: Push backport branch
git push origin backport-12345-to-8.x
# Step 6: Open PR
gh pr create \
--base 8.x \
--head backport-12345-to-8.x \
--title "[8.x] Fix: bug Y (#12345)" \
--body "Backport of #12345 to 8.x"
# Run tests on backport branch
node scripts/check_changes.ts
# Check for backport-specific issues
# - API changes not in target branch
# - Dependencies not available in target version
# - Test data fixtures different
# Validate merge base
git merge-base origin/8.x HEAD
# Should be recent commit from 8.x, not ancient
git reset --soft HEAD~1
# Changes still staged, commit still in reflog
# Can re-commit with different message
git reset --hard HEAD~1
# Changes discarded, commit in reflog only
# Can recover with reflog if needed
# ⚠️ DANGER: Only for personal branches, never main/8.x
# Reset to before bad commit
git reset --hard HEAD~1
# Force push
git push --force-with-lease origin my-branch
# ⚠️ WARNING: Breaks collaborators' local branches
# If merge not pushed yet
git reset --hard HEAD~1
# If merge already pushed (revert instead)
git revert -m 1 abc123
# Find commit before rebase
git reflog | grep "rebase"
# Reset to before rebase
git reset --hard abc123
# If cherry-pick not committed yet
git cherry-pick --abort
# If already committed
git reset --hard HEAD~1
# 1. Clean working directory
git status
# Should show "nothing to commit, working tree clean"
# 2. Fetch latest
git fetch origin
# 3. Backup branch
git branch backup-$(date +%Y%m%d-%H%M%S)
# 4. Check remote tracking
git branch -vv
# Should show [origin/branch-name]
# ❌ NEVER: git push --force
# ✅ ALWAYS: git push --force-with-lease
# Force-with-lease fails if remote changed
git push --force-with-lease origin my-branch
# If failed, fetch and rebase first
git fetch origin
git rebase origin/my-branch
git push --force-with-lease origin my-branch
# Check if branch is protected
gh api repos/elastic/kibana/branches/main/protection
# Protected branches (Kibana):
# - main: no force push, requires PR + review
# - 8.x, 7.17, etc: no force push, requires PR + review
# Safe branches (your personal branches):
# - feature/my-branch: force push OK
# - fix/my-fix: force push OK
@buildkite-ci-debugger# Debug CI failure after rebase
@buildkite-ci-debugger --build <url>
# If CI red after rebase, may need to:
# - Resolve merge conflicts in CI config
# - Update test snapshots
# - Fix flaky tests exposed by rebase
@kibana-precommit-checks# Validate after conflict resolution
@kibana-precommit-checks
# Ensures:
# - No conflict markers remain
# - Type checks pass
# - Linting passes
# - Tests pass
@migration-planner# Backport migration changes
@migration-planner track migration progress
@git-workflow-helper backport PR #12345 to 8.x
User: "squash my last 5 commits into 1"
Agent Actions:
# 1. Show commits to squash
git log --oneline HEAD~5..HEAD
# 2. Start interactive rebase
git rebase -i HEAD~5
# 3. Edit rebase plan
# pick abc123 feat: initial work
# squash def456 fix: review feedback
# squash ghi789 fix: lint
# squash jkl012 fix: types
# squash mno345 test: add tests
# 4. Edit commit message
# feat: add feature X
#
# Combines 5 commits:
# - Initial implementation
# - Review feedback
# - Lint and type fixes
# - Test coverage
# 5. Verify
git log --oneline HEAD~1..HEAD
Output: Single clean commit ready for merge.
User: "resolve conflicts in http_server.ts during rebase"
Agent Actions:
# 1. Show conflict
git diff src/core/server/http_server.ts
# 2. Analyze context
git log --oneline origin/main..HEAD -- src/core/server/http_server.ts
# 3. Resolution strategy
# Conflict: both changed port number
# Decision: Keep incoming (your commit) - 5601 is correct
# 4. Resolve
# Edit file, remove markers, keep 5601
# 5. Validate
yarn test:type_check --project src/core/tsconfig.json
yarn test:jest src/core/server/http_server.test.ts
# 6. Continue rebase
git add src/core/server/http_server.ts
git rebase --continue
Output: Conflict resolved, rebase continues.
User: "undo my reset, I lost my commit"
Agent Actions:
# 1. Find lost commit
git reflog -30
# def456 HEAD@{1}: commit: feat: feature X <-- FOUND
# 2. Recover options
# Option A: Cherry-pick
git cherry-pick def456
# Option B: Reset to lost commit
git reset --hard def456
# Option C: Create branch from lost commit
git checkout -b recovery-feature-x def456
# 3. Verify
git log --oneline HEAD~1..HEAD
Output: Commit recovered, work safe.
User: "backport PR #12345 to 8.x"
Agent Actions:
# 1. Fetch target branch
git fetch origin 8.x
# 2. Create backport branch
git checkout -b backport-12345-to-8.x origin/8.x
# 3. Find commits to cherry-pick
gh pr view 12345 --json commits --jq '.commits[].oid'
# abc123
# def456
# 4. Cherry-pick
git cherry-pick abc123 def456
# 5. Resolve conflicts (if any)
# (follow conflict resolution steps)
# 6. Push and create PR
git push origin backport-12345-to-8.x
gh pr create \
--base 8.x \
--head backport-12345-to-8.x \
--title "[8.x] Fix: security issue (#12345)" \
--body "Backport of #12345 to 8.x"
# 7. Validate CI
# Wait for CI, fix if red
Output: Backport PR created and validated.
# Problem: Branch has merge commits
git log --oneline --merges origin/main..HEAD
# Solution 1: Recreate branch from main
git checkout main
git pull origin main
git checkout -b my-branch-clean
git cherry-pick <commit1> <commit2> <commit3>
# Solution 2: Use rebase -p (preserve merges)
git rebase -p origin/main
# Problem: Commit already applied (same changes)
git cherry-pick --skip
# Or abort and manually check
git cherry-pick --abort
git diff origin/main..HEAD
# Problem: Base branch diverged significantly
# Solution: Abort and recreate branch
git rebase --abort
git checkout main
git pull origin main
git checkout -b my-branch-fresh
git cherry-pick <commits> # Select only necessary commits
# Problem: Remote branch changed
git push --force-with-lease origin my-branch
# To origin/my-branch
# ! [rejected] my-branch -> my-branch (stale info)
# Solution: Fetch and rebase
git fetch origin
git rebase origin/my-branch
git push --force-with-lease origin my-branch
# Problem: Did 'git reset --hard' by mistake
# Solution: Use reflog to recover
git reflog -30
# Find commit before reset
git reset --hard <commit-before-reset>
Self-evaluation loop for the treadmill Claude plugins pack. Runs cursor-plugin-evals against bundled skills, tracks quality over time, and escalates recurring failures via PAMS. Use periodically or before publishing plugin updates.
Autonomously implement technical plans from context/changes/<change-id>/plan.md under Codex's /goal — no human interaction at any point. Sibling of /shape-implement for unattended runs, in an interactive /goal session or headless via Codex -p. Flips the plan's Automated Progress rows, verifies each phase through an automatic quality-gate stack (plan success criteria, deliberate-break check, full suite), commits each phase on green with Conventional Commits, and surfaces pending Manual rows as a closing human checklist. Use when the user wants autonomous or unattended plan execution, pairs /goal with a plan, asks to "run the plan under /goal", or needs headless implementation.
Review implementation against plan for drift, dangerous decisions, and pattern compliance
Implement technical plans from context/changes/<change-id>/plan.md with verification
Review implementation plans for substance, feasibility, and architectural fitness. Use when user asks to review a plan, says "is this plan good", "check my plan", "review this plan", mentions plan review, or references a plan file and asks for feedback. Also trigger when user finishes /shape-plan and wants validation before starting /shape-implement.
Drive an approved implementation plan to completion phase by phase, test-first, through the red→green→refactor cycle, but only for phases whose implementation does not exist yet. Reads a plan from context/changes/<change-id>/plan.md and the canonical Progress section, and for each phase first checks whether the phase is TDD'able and still unimplemented — if it is, you write a failing test (RED), make it pass with the minimal code (GREEN), then clean up (REFACTOR); if it is not TDD'able, you redirect that phase to /shape-implement; if implementation is already present, you stop and explain that TDD does not work for already existing code, then suggest /shape-implement for that phase. Mirrors /shape-implement (same plan, same Progress source of truth, same phase-end commit ritual and clipboard handoffs) but flips the order so the failing test always comes before the code. Assumes test infrastructure is already in place — it does NOT set up runners, configs, fixtures, or CI. Use this skill when the user says "td