We don't merge one-off branches into other one-off branches unless they're all under the same feature. Everything goes via develop when they're complete, and ne

We don't merge one-off branches into other one-off branches unless they're all under the same feature. Everything goes via develop when they're complete, and new one-off branches are created from develop. When we release to production, develop gets merged to master. We consider a 'feature' a large piece of work that will take several weeks, during which time several releases to production may be done for other work/tickets.