On Wed, Aug 03, 2016 at 05:01:29PM -0400, Leo Famulari wrote: > Do you mean `git checkout core-updates-next && git merge master`? That's > what I've done.
Another option would be the following: git checkout master git checkout -b core-updates git cherry-pick "commit 1 from core-updates-next" git cherry-pick "commit 2 from core-updates-next" ... If there are only a dozen commits in core-updates-next, this could be feasible, with the danger of forgetting some. Andreas
