Rebase Main

Rebase current branch onto origin/main and resolve conflicts

vm0-ai 9226d5d 399 B Updated

File contents

Rebase Main

  1. Run git fetch origin main to get latest main.
  2. Run git rebase origin/main to rebase current branch.
  3. If there are conflicts, resolve them by reading the conflicted files, making the correct edits, then git add and git rebase --continue. Repeat until rebase completes.

vm0-ai/team-skills/tree/main/github-workflow/skills/rebase-main commit 9226d5d643

Frequently asked questions

npx skillmds@latest add vm0-ai/rebase-main