cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 22:17:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation-server-tools into PRManager

Browse Source
This commit is contained in:
Cyberboss
2017-11-11 23:58:16 -05:00
parent bde8763367 7dab43cf68
commit 89475c8d8b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/ServerInstance/Repository.cs
+5
View File
@@ -521,6 +521,11 @@ namespace TGServerService
else if (result != null)
return result;
}
//if this is a tracked branch, we need to reset to remote first and delete the PR list
ResetNoLock(Repo.Head.TrackedBranch ?? Repo.Head);
DeletePRList();
var Opts = new CheckoutOptions()
{
CheckoutModifiers = CheckoutModifiers.Force,