Rebase with origin/main Overview Fetches the latest origin/main, rebases the current branch onto it, and resolves every conflict that arises — one commit at a time — until the rebase completes cleanly. Warning: Rebase Flips ours/theirs During a rebase, git's labels are inverted from what you expect: | Label | Means | |-------|-------| | / (top of conflict) | origin/main — the base being rebased onto | | (bottom of conflict) | Your commit being replayed | Always resolve conflicts to preserve the intent of your commit while incorporating origin/main's context. Workflow 1. Fetch & Start If the o…