That notion is false, right, thus I&#x27;d rather think &quot;this commit is not correct anymore&quot;.<p>Regarding getting ideas how the code was developed, for the commit that is not correct anymore I have a commit message telling me why it was added. For reasonably small commits, I don&#x27;t a lot of room for misunderstandings and wrong fixes.<p>This applies if the required changes in your branch are rather small. I think we can agree that rebasing breaks if some changes in master require lots of changes in your branch. But so does merging, as the merge becomes even more horrible and error-prone in that case. Basically, large changes (&quot;real&quot; development) should happen neither in merge commits nor during rebases in my opinion.