kramme:rebase-pr

To safely rebase a Git branch and force-push, fetch the latest base branch, apply commits with --autostash, resolve conflicts automatically, and push using --force-with-lease to prevent overwriting remote changes.

The safest way to force-push a rebased Git branch is using --force-with-lease, which verifies the remote branch hasn't received new commits before overwriting, preventing accidental loss of collaborators' work.

Handle Git rebase conflicts automatically by running rebase rounds that attempt to resolve merge issues, recording the changes made, and providing a summary of the resolved conflicts before pushing.

Rebase a PR branch without losing uncommitted local changes by using the --autostash flag, which temporarily stashes your work, applies the rebase, and reapplies your changes automatically.

Yes, you can automatically detect the base branch by checking the repository configuration against origin/main or origin/master, fetching updates, and rebasing the current branch onto the detected base.