@dominic I think with the above you shouldn't have to deal with either the lockfile or the git diffs, are there any other inconveniences from lockfiles? If possible I'd love to use the lockfile default without negatively affecting anyone who wants to abstain from using them.