On Jun 5, 2012, at 3:56 PM, Steve Ebersole wrote: > Would we merge the directories on each branch and then merge branches? From what little I know of git I think this would be best. What's about doing first a merge keeping test and matrix and then combining test+matrix on master and do another merge/rebase?