If you are scared of git rebase -i this might help you get used to this powerful git feature. https://twitter.com/intellijidea/status/1567784914765975553