Git workflow fragment: trial merge of branches

[kpreid]

Let's say you have two or more independent Git branches, and you want to make sure the combination of them works correctly, but aren't ready to permanently merge or rebase them together. You can do a merge and discard it (either by resetting afterward or using a temporary branch), but that takes extra commands when you're done with the trial. Here'

Comments

[ex_juan_gan]

Neat (but rather complicated, a little bit... but neat)