From 595b39e77dbd7a2291c43324a133fc4e5e65ca85 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sat, 11 Nov 2017 22:13:07 -0500 Subject: [PATCH] Checkout resets to remote branch and DeletesPRList --- TGServerService/ServerInstance/Repository.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/TGServerService/ServerInstance/Repository.cs b/TGServerService/ServerInstance/Repository.cs index 682b239346..0543742292 100644 --- a/TGServerService/ServerInstance/Repository.cs +++ b/TGServerService/ServerInstance/Repository.cs @@ -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,