Merge pull request space-wizards#8 from juliangiebel/development

Change git checkout to be forced to discard local changes
DeltaV-Station · Sep 26, 2023 · 57b3d57 · 57b3d57
2 parents d8bcda3 + a40dca2
commit 57b3d57
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/SS14.MapServer/Services/GitService.cs b/SS14.MapServer/Services/GitService.cs
@@ -92,7 +92,7 @@ private void Clone(string repoUrl, string directory, string gitRef)
 
         RunCommand(Path.GetFullPath("./..", directory), "clone --recurse-submodules", sshConfig, repoUrl);
         RunCommand(directory, "fetch -fu origin", gitRef);
-        RunCommand(directory, "checkout", StripRef(gitRef));
+        RunCommand(directory, "checkout --force", StripRef(gitRef));
 
         _log.Information("Done cloning");
     }
@@ -117,7 +117,7 @@ private void Pull(string repoDirectory, string gitRef)
         RunCommand(repoDirectory, "fetch -fu origin", gitRef);
 
         _log.Debug("Checking out {Ref}", StripRef(gitRef));
-        RunCommand(repoDirectory, "checkout", StripRef(gitRef));
+        RunCommand(repoDirectory, "checkout  --force", StripRef(gitRef));
 
         _log.Debug("Pulling latest changes");
         RunCommand(repoDirectory, "pull origin HEAD --ff-only --force");