Skip to content

Instantly share code, notes, and snippets.

@franTarkenton

franTarkenton/Rebase Hell.md

Last active December 13, 2022 20:53
Show Gist options
  • Save franTarkenton/c714dd9310dadd45d6aad383b8adac03 to your computer and use it in GitHub Desktop.
Save franTarkenton/c714dd9310dadd45d6aad383b8adac03 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
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
  1. if no conflicts show up then
git rebase --skip

Push changes once rebase has been completed

git push -f origin <branch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment