git rebasing

gistfile1.txt

From:
https://dev.to/maxwell_dev/the-git-rebase-introduction-i-wish-id-had

Simple flow
git checkout master
git checkout feature/branch
git rebase master
git push --force-with-lease


Handle rebasing conflicts
git status
git add
git commit
git rebase --continue
git push --force-with-lease

Shitty things happens
git rebase --abort
git rebase --skip

Interactive
git rebase -i master

Squash
git rebase -i --autosquash master

Fixing up a commit
git commit --fixup <commitID>