Fixes pull request merging

This commit is contained in:
Jordan Brown
2017-11-13 12:10:14 -05:00
committed by GitHub
parent 20adbc7e1a
commit 7d2d407da7
+1 -1
View File
@@ -928,7 +928,7 @@ namespace TGServerService
}
//so we'll know if this fails
var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Config.Name));
var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Environment.NewLine, Config.Name));
if (Result == null)
try