Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 6e00fc4..304208d 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -196,7 +196,16 @@ namespace  GitLive {
                        var head_commit = this.repo.lookup_commit(head_oid);
                         
                
-                       var anc_oid = this.repo.merge_base(master_commit.get_oid(), head_commit.get_oid());
+                       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);
                        
                
                }