From 546016fc41809fd3a1cd095984ee7cb6d636e6b2 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 15 Mar 2019 11:31:45 +0800
Subject: [PATCH] Git.vala

---
 Git.vala | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Git.vala b/Git.vala
index ba9b8e4d..304208de 100644
--- a/Git.vala
+++ b/Git.vala
@@ -198,6 +198,15 @@ namespace  GitLive {
 		
 			var anc_oid = this.repo.merge_base(master_commit.get_id(), head_commit.get_id());
 			
+			var anc_commit = this.repo.lookup_commit(anc_oid);
+			var anc_tree = anc_commit.get_tree();
+			
+			var master_tree = master_commit.get_tree();
+			var head_tree = head_commit.get_tree();
+			var mo = new Ggit.MergeOptions();
+			mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
+			var ix  = this.repo.merge_trees(anc_tree, master_tree, head_tree, mo);
+			
 		
 		}
 		
-- 
2.39.2