dev-update-working-branch

To update your feature branch, you need to fetch origin main, fast-forward your local main branch, and rebase your current working branch onto main. This maintains a clean, linear history and ensures tests run against the latest code.

You should rebase your working branch onto main before pushing fixes during code reviews, before resolving feedback, or whenever your branch is behind main. This reduces merge conflicts by aligning your changes with the latest main branch updates.

When you attempt to rebase with uncommitted changes, safety checks will trigger a warning. These checks prevent potentially losing work during the rebase process, ensuring your local modifications are safely handled before updating the branch.

No, you cannot run this rebase process directly on the main branch. Safety checks explicitly prevent running the update workflow on main, ensuring the operation only applies to feature branches to maintain a clean, linear history.

The best way to maintain a clean linear history is to fetch origin main, update your local main to match it, and rebase your feature branch onto main. This applies the latest changes underneath your commits, reducing merge conflicts before pushing fixes.