rebase-latest-main

npx skills add dyoshikawa/rulesync --skill rebase-latest-main --agent claude-code

Same command for any agent — swap --agent for codex, cursor, copilot.

# Rebase Latest Main Fetch the latest `origin/main` and rebase it onto the current working branch. ## Step 1: Verify Current State 1. Check the current branch: ```bash git branch --show-current ``` 2. Ensure there are no uncommitted changes: ```bash git status --porcelain ``` If there are uncommitted changes, either: - Commit them first, or - Ask the user how to proceed (commit, stash, or abort) ## Step 2: Fetch Latest Changes Fetch the latest changes from the remote: ```bash git fetch origin main ``` ## Step 3: Rebase onto origin/main Start the rebase: ```bash git rebase origin/main ``` ### If rebase succeeds without conflicts: Proceed to Step 5. ### If conflicts occur: 1. Identify conflicting files: ```bash git diff --name-only --diff-filter=U ``` 2. For each conflicting file: - Read the file content to understand the conflict - Analyze both versions (HEAD and origin/main) - Resolve the conflict by choosing the appropriate changes or merging them - Stage the resolved file: ```bash git add <resolved-file> ``` 3. Continue the rebase: ```bash git rebase --continue ``` 4. Repeat until all conflicts are resolved and rebase is complete. ## Step 4: Handle Rebase Failure If unable to res

git branch --show-current
git status --porcelain
git fetch origin main
git rebase origin/main
git diff --name-only --diff-filter=U
git add <resolved-file>
git rebase --continue
git rebase --abort
git push --force-with-lease