[git-users] Merging parts of a commit tree into another

2015-08-30 Thread Michael
This may seem a little strange. I'd like to merge parts of one commit sequence into another. Off of master, I have a bunch of small sequences of 3-4 commits, generally. Each on their own branch. I have integrationTest, branched off master, that has each of these merged in. From

[git-users] What is the best practice for merging multiple branches at once?

2015-08-30 Thread Michael
Lets say I have 4 branches off master. I have tested, and found that they are all ready to go. What's the best way to merge them in? Is it: 1. A single merge onto master of all 4 branches at once. 2. One-by-one merging from the commit where they branched off, in order of oldest branch first. 3.