johnkerl Detect the repo's primary branch: check git remote show origin for HEAD, then fall back to looking for main/master/preprod/develop in that order.
Steps:
- Record the current branch name
- If there are uncommitted changes,
git stash git switch <primary>andgit pullgit switch <original-branch>git pull(if an upstream is set for this branch)git merge <primary>— orgit rebase <primary>if the branch's existing commits are already pushed and rebase is clearly wrong; default to mergegit push- If stashed,
git stash pop
If there are merge conflicts, stop immediately and describe which files conflict and what the conflict looks like. Do not attempt to resolve conflicts automatically.
Report what you did when finished: primary branch name detected, whether a stash was needed, final push status.