{
this.loadLocalBranches();
+
+
var oid = this.repo.revparse(this.head.get_name() ).get_id() ;
var moid = this.repo.revparse("refs/heads/master" ).get_id() ;
public void mergeMasterIntoHead()
{
// assumes head is not master...
+ this.loadLocalBranches();
+ GLib.debug("head rev = %s", this.head.get_name());
var head_oid = this.repo.revparse(this.head.get_name() ).get_id() ;
var master_oid = this.repo.revparse("refs/heads/master" ).get_id() ;
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();