git releases management
See the following posts on Junio C Hamano (git maintainer) blog: Completing a merge Never merging back (about branches forked with intention of not merging back) Resolving conflicts/dependencies between topic branches early Fun with remote branches (1) Fun with remote branches (2) Take also look at gitworkflows manual page.