Merge Rebase

{{ 𝛀𝛀𝛀 }} Rebase from main

majiayu000 384fdc9 2 files Β· 1.2 KB Updated 567 repo stars

File contents

Rebase Current Branch onto Main

  1. Check current branch name and confirm with user
  2. Do NOT create a worktree - work in the current directory
  3. Run git fetch origin main && git rebase origin/main
  4. If conflicts exist, list them and resolve one at a time preserving our branch's intent, running git rebase --continue after each
  5. Run tests to verify
  6. Push with git push --force-with-lease

majiayu000/claude-skill-registry-data/tree/main/development/merge-rebase commit 384fdc9927

Frequently asked questions

npx skillmds add majiayu000/merge-rebase