Git.vala

diff --git a/Git.vala b/Git.vala
index 0ba9e3d..5d4d6ac 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -186,6 +186,18 @@ namespace  GitLive {
                        
                        
                }
+               public void mergeMasterIntoHead()
+               {
+                       // assumes head is not master...
+                       var head_oid =  this.repo.revparse(this.head.get_name() ).get_id()  ;
+                       var master_oid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
+
+                       var master_commit  = this.repo.lookup_commit(master_oid);;
+                       var head_commit = this.repo.lookup_commit(head_oid);
+               
+               
+               }
+               
                
                /*
                public bool doMergeClose(string commit_message)