Skip to content

Allow to resolve conflicts on UserMergeToRef

Igor Drozdov requested to merge id-go-allow-conflicts-on-merge into master

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

Merge request reports