From: Alan Knowles <alan@roojs.com>
Date: Fri, 15 Mar 2019 05:50:06 +0000 (+0800)
Subject: Git.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=7c8ed2cff16cca0783ac3a94ab1e8b57d795c283

Git.vala
---

diff --git a/Git.vala b/Git.vala
index 07558991..566ad557 100644
--- a/Git.vala
+++ b/Git.vala
@@ -211,10 +211,15 @@ namespace  GitLive {
 			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);
-			ix.write();
+			
+			// might be conflicts..
+			if (ix.has_conflicts()) {
+				GLib.debug("merge has conflicts");
+				return;
+			}
+			this.repo.checkout_index(ix, new Ggit.CheckoutOptions());
 			 var treeoid = ix.write_tree();
 			 
-			 
 			  
 			var parents =   new Ggit.Commit[] { master_commit };