git-rebase

To squash work-in-progress commits before a pull request, use a non-interactive autosquash rebase to clean up your feature branch history. This safely rewrites intermediate commits into a tidy series without requiring manual editor intervention.

Git rebase handles conflict resolution by applying commits sequentially and pausing on conflicts. You resolve files manually, stage them, and run git rebase --continue, or use git rebase --abort to rollback and abandon the history rewriting process.

You cannot use interactive rebase in automated runtime environments because it opens an editor and causes automation hangs. You must use non-interactive autosquash patterns and deterministic tooling to update the rebase todo list instead.

You should avoid rebasing shared or public commits because rewriting history disrupts teammates who already pulled the branch. Only rebase local feature branches to update bases or untangle dependency chains safely.

The best way to update a feature branch onto the latest main is executing a targeted rebase. This moves your branch base to the latest main commits, creating a linear history while preserving your specific feature changes.

To fix a messed up git rebase, run git rebase --abort to immediately rollback and restore your original branch state. This rollback principle prevents conflict panic and safely cancels the history rewrite.