Stash and Rebase

Stash current changes, rebase onto latest main, and reapply stash.

Steps

1. Stash all current changes including untracked files:

   bashCopy

   git stash push -u -m "Auto-stash before rebase"
   

2. Fetch the latest changes from remote:

   bashCopy

   git fetch origin
   

3. Rebase the current branch onto the latest main:

   bashCopy

   git rebase origin/main
   

4. Reapply the stashed changes:

   bashCopy

   git stash pop
   

If the rebase encounters conflicts, pause and inform the user so they can resolve them before attempting to pop the stash.