rebase-main

To rebase a feature branch onto the latest origin/main, the process fetches origin main, replays your branch commits onto it, and guides you through any conflict resolution before pushing the updated linear history.

When starting a git rebase on main with uncommitted changes, the workflow automatically stashes your local modifications, performs the rebase onto origin/main, and then reapplies the stashed changes to keep your working directory intact.

To resolve conflicts during a git rebase onto main, the workflow detects the conflicting commits, provides steps to fix them, and continues the rebase sequence until all your branch commits are successfully replayed onto the updated origin/main.

Yes, you can use force-with-lease to push a branch after rebasing onto origin/main, which validates the rebase success first and then safely pushes your rewritten history to the remote without overwriting unexpected remote changes.

The best way to keep a feature branch up to date with main is to rebase it onto the latest origin/main, which replays your commits onto the newest changes and maintains a clean, linear history while reducing merge complexity.

You should avoid rebasing your branch onto origin/main if it is a shared branch with multiple collaborators, because replaying commits rewrites history and requires a force push, which can disrupt other developers' local repositories.