Git: Merge branches Join two or more development histories together External Link http://git-scm.com/docs/git-merge