Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Merge strategy ours

Robert Altman March 22, 2021

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?

0 answers

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events