Fixed merge issue

Author: JakeGinnivan

GitVersionCore/GitVersionContext.cs

@@ -41,6 +41,8 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
         public Branch CurrentBranch { get; private set; }
         public Commit CurrentCommit { get; private set; }
 
+        public BranchConfig CurrentBranchConfig { get; set; }
+
         readonly bool IsContextForTrackedBranchesOnly = true;