I think many developers shy away from rebasing because it regularly cannot be
done automatically and you need a bit of practice to get used to a rebase flow
and all it's interesting states (WTH is an empty commit?!). >
/status/1069176992564682752
2 replies
Replying to @coderbyheart
@Maxwell_Dev wrote a very good detailed guide
on rebasing:
https://dev.to/maxwell_dev/the-git-rebase-introduction-i-wish-id-had and even
in there some of the more esoteric feeling things that can happen during a
rebase are not covered.
Learn by practicing this, and remember that you can always abort a rebase
safely. >
Replying to @coderbyheart
@Maxwell_Dev But if you are uncertain at
first remember to save your branch before rebasing. If you push it to origin
before a rebase attempt and you botch that rebase, you can do a git reset --hard
origin/my-branch and everything is nice again ;-)