Andy Balaam explains how to pick individual changes or whole branches and merge them into each other in git, using cherry-pick, merge and rebase. Slides are here: http://www.artificialworlds.net/blog/2013/07/11/merging-in-git/