+ var mo = new Ggit.MergeOptions();
+ var co = new Ggit.CheckoutOptions();
+ var commits = new Ggit.Commit[] { master_commit };
+
+ this.repo.merge(commits, mo, co);
+ /*
+ if (ix.has_conflicts()) {
+ GLib.debug("merge has conflicts");
+ return;
+ }
+
+ var cfg = this.repo.get_config().snapshot();
+ var sig = new Ggit.Signature.now(
+ cfg.get_string("user.name"),
+ cfg.get_string("user.email")
+ );
+
+ var parents = new Ggit.OId[] { anc_commit.get_id() };
+
+ var treeoid = ix.write_tree_to(this.repo);
+
+ this.repo.create_commit_from_ids("HEAD",
+ sig, sig, null, "Test Merge", treeoid, parents);
+
+ /*