Git Rebase Main

Purpose

Ensure the current feature branch includes all the latest changes from main before proceeding with code review, UAT, or release. This prevents merge conflicts and ensures tests run against the latest codebase.

Hard Rules

Must

• Fetch from origin before rebasing.
• Handle rebase conflicts by stopping and reporting to the user.
• Verify the branch is not main before rebasing.

Must Not

• Force-push without user confirmation.
• Rebase if there are uncommitted changes.

Actions