Lock files too
Checkout and merge the thing