From: Alan Knowles <alan@roojs.com>
Date: Fri, 15 Mar 2019 02:59:37 +0000 (+0800)
Subject: Git.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=caaad4ab51277d3bcda7eb1af0e76a23343df7be

Git.vala
---

diff --git a/Git.vala b/Git.vala
index 0ba9e3d4..5d4d6acf 100644
--- 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)