Mike Jarmy <mjarmy@xxxxxxxxx> writes: > My question is this: How do I manage a checkin for a bugfix that > affects, say, only branches v3, v4, and v5? Take a look at "Resolving conflicts/dependencies between topic branches early" blog post by Junio C Hamano (git maintainer) at http://gitster.livejournal.com/27297.html In short the solution is to create separate topic branch for a bugfix, branching off earliest place where it would be relevant, then merge this bugfix branch into all development branches you need (e.g. maint-v3, maint-v4, maint-v5, master). This means: $ git checkout -b fix-frobulator--issue-1235 maint-v3 <create commit or series of commits> $ git checkout maint-v3 $ git merge fix-frobulator--issue-1235 <resolve conflicts if any> $ git checkout maint-v4 $ git merge fix-frobulator--issue-1235 <resolve conflicts if any> [...] -- Jakub Narebski Poland ShadeHawk on #git -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html