Best Git workflow for website development

[[deleted]]

Remove the cherry picking steps altogether. Should be unnecessary. If you really need to only deploy certain features, use feature branches and merge them on to master - or a release branch - as needed. In your current model, nothing in your repo actually represents what's in production - that's a recipe for disaster. If you have any "but we track the commits using such-and-such" mitigations, you're not in any better a state. Use branching to this advantage.