diff options
Diffstat (limited to 'lib/gitlab/git/conflict/resolver.rb')
| -rw-r--r-- | lib/gitlab/git/conflict/resolver.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/git/conflict/resolver.rb b/lib/gitlab/git/conflict/resolver.rb index aa5d50d1fb1..2069d26400e 100644 --- a/lib/gitlab/git/conflict/resolver.rb +++ b/lib/gitlab/git/conflict/resolver.rb @@ -9,15 +9,16 @@ module Gitlab ConflictSideMissing = Class.new(StandardError) ResolutionError = Class.new(StandardError) - def initialize(target_repository, our_commit_oid, their_commit_oid) + def initialize(target_repository, our_commit_oid, their_commit_oid, allow_tree_conflicts: false) @target_repository = target_repository @our_commit_oid = our_commit_oid @their_commit_oid = their_commit_oid + @allow_tree_conflicts = allow_tree_conflicts end def conflicts @conflicts ||= wrapped_gitaly_errors do - gitaly_conflicts_client(@target_repository).list_conflict_files.to_a + gitaly_conflicts_client(@target_repository).list_conflict_files(allow_tree_conflicts: @allow_tree_conflicts).to_a rescue GRPC::FailedPrecondition => e raise Gitlab::Git::Conflict::Resolver::ConflictSideMissing, e.message end |