It’s also possible that I start my next task without remembering to create a new diff first. That might explain the conflict when the original commit becomes immutable?