Old, but gold, if you use git for software development, you should be handy with using git rebase.
This should help you to get rid of the fear about using it:
"Don't Be Scared of git rebase" by Nathan Leclaire
Don't have an account? You can sign up here