Git.vala
authorAlan Knowles <alan@roojs.com>
Fri, 15 Mar 2019 05:19:29 +0000 (13:19 +0800)
committerAlan Knowles <alan@roojs.com>
Fri, 15 Mar 2019 05:19:29 +0000 (13:19 +0800)
Git.vala

index 8a53c36..0755899 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -211,6 +211,7 @@ 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();
                         var treeoid = ix.write_tree();