PR Rebase

Rebase the current branch on the latest upstream changes, resolve conflicts, and push.

Instructions

1. Determine the git remote setup:

   git remote -v
   git branch -vv
   

   In GitHub Actions for cross-repo PRs:

   • origin points to the head repo (fork) - this is where you push
   • upstream points to the base repo - this is what you rebase onto

   For same-repo PRs, origin points to the main repo and there may be no upstream.