Rebase

Rebasing is a way of taking you existing changes and applying them on-top of the latest version of another branch.

YouTube - Git Rebase in IntelliJ

How to update your main branch

1. Fetch the latest changes

2. Checkout the branch you want to update

3. Rebase onto Remote | origin/main branch

IntelliJ guide on Merge, rebase and cherry-picking