Rebase Hell.md

Initiate the rebase

git fetch origin main
git pull origin main --rebase

Resolve conflicts

VSCode does a great job of walking through the conflicts... do that until continue returns Git: Failed to execute git shows up.

1. verify that where the rebase is stuck doesnt have conflicts

git diff --check

2. if no conflicts show up then

git rebase --skip

Push changes once rebase has been completed

git push -f origin <branch>