Continuous Delivery: Reliable Software Releases through Build, Test, and Deployment Automation

by David Farley

It is important to remember that bugfixes must ultimately be merged back into trunk; in general, it is wise to do this immediately after a bugfix is committed to a branch.