From 14a44f176a5eac7b296be2b584a24a6f101bacaa Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 15 Mar 2019 13:19:29 +0800 Subject: [PATCH] Git.vala --- Git.vala | 1 + 1 file changed, 1 insertion(+) diff --git a/Git.vala b/Git.vala index 8a53c361..07558991 100644 --- 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(); -- 2.39.2