This is the answer for anyone who isn't maintaining something like Windows, with multiple versions of product simultaneously for years. If you are cutting relea

This is the answer for anyone who isn't maintaining something like Windows, with multiple versions of product simultaneously for years. If you are cutting releases of a web service, cherry pick into short lived release branches.