From c9a12b1d92ac946a15fca66fd28e8f4364282149 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 6 Jul 2016 11:06:57 -0400
Subject: Start of MR confict resolver service

---
 app/models/merge_request.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'app/models/merge_request.rb')

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 157901378d3..d3a611414cb 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -321,6 +321,18 @@ class MergeRequest < ActiveRecord::Base
     end
   end
 
+  def conflicts?
+    project.repository.conflicts?(diff_head_sha, target_branch)
+  end
+
+  def conflicts
+    project.repository.conflicts(diff_head_sha, target_branch)
+  end
+
+  def conflict_diff(conflict)
+    project.repository.conflict_diff(diff_head_sha, target_branch, conflict[:ancestor][:path])
+  end
+
   def merge_event
     @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
   end
-- 
cgit v1.2.1