DEV Community


Discussion on: How I Got Out of a Knee Deep Git Problem

stevetaylor profile image
Steve Taylor • Edited

Squashing via git rebase is hard. Do it in easy mode instead:

git fetch
git merge origin/master

If there are conflicts, resolve them and git commit to complete the merge. Then:

git reset --soft origin/master
git commit -m "(your message)"
git push --force