Rebase Main
- Run
git fetch origin mainto get latest main. - Run
git rebase origin/mainto rebase current branch. - If there are conflicts, resolve them by reading the conflicted files, making the correct edits, then
git addandgit rebase --continue. Repeat until rebase completes.