merge: default checkout strategy for should be SAFE
merge: checkout default shouldn't clobber given
Merge pull request #2294 from ethomson/merge_checkout_strategy

Merge checkout strategy