If you mean that you wanted to wait for the branch (and this is the personal branch of the project), you can (from the pink branch) use git rebase master . This will push the pink commits, move pink forward to 29934b6, and then reapply the patches.
Otherwise, amber git merge is probably the best answer.
Another possibility (again, from the "pink") git cherry-pick 9a51fd2; ... git cherry-pick 9a51fd2; ... for each of these changes. This will make individual new fixations pink. You can also name branches as master , master^ and master^^ .
source share