Allow to resolve conflicts on UserMergeToRef
When AllowConflicts option is passed, let's set the "ours" strategy to git-merge command.
In this case, we won't have the merge failed due to the conflicts.
Edited by Igor Drozdov
When AllowConflicts option is passed, let's set the "ours" strategy to git-merge command.
In this case, we won't have the merge failed due to the conflicts.