In one specific work-flow, I need my developers to be able to perform a
git merge -s ours branch-qa
to resolve merge conflicts with branch-qa without changing file on the current branch.
How can I do this within SourceTree?
