Rebase Commit Push Pr

Safely sync a working branch with origin/main, handle rebase conflicts, then publish and open a PR if needed.

Steps

1. Inspect branch and working tree

   • git branch --show-current
   • git status --short
   • If there are unresolved conflicts already, stop and ask for user direction.

2. Fetch and rebase onto main

   • git fetch origin main
   • git rebase origin/main

3. Resolve rebase conflicts (if any)

   • Check conflicted files: git status --short
   • Resolve each conflict intentionally (do not run destructive resets).
   • Stage resolved files: git add <paths> or git rm <paths>.
   • Continue: git rebase --continue.
   • Repeat until rebase finishes or explicit user input is required.

4. Commit user-requested local changes (only if needed)

   • If git status --short is empty, skip commit.