merge!

This merges a branch and puts the results in the workdir!