The golden rule of rebasing ( https://www.atlassian.com/git/tutorials/merging-vs-rebasing#the-golden-rule-of-rebasing ) is a symptom of deficiencies in #Git that are resolved in #Mercurial with the evolve extension: https://blog.disy.net/hg-evolution/