Better handling of git conflicts when publishing to github pages.

shannah · Oct 1, 2023 · dc2eb31 · dc2eb31
1 parent 684a1f8
commit dc2eb31
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/cli/src/main/java/ca/weblite/jdeploy/services/CheerpjService.java b/cli/src/main/java/ca/weblite/jdeploy/services/CheerpjService.java
@@ -198,7 +198,10 @@ private void publishToGithubPages() throws IOException, InterruptedException {
             throw new IOException("Github pages publish path is null.");
         }
         File publishPath = new File(packageJSONFile.getParentFile(), githubPagesPublishPath);
+        boolean stashed = false;
         if (!currentBranch.equals(githubPagesBranch)) {
+            executeGitCommand("git", "stash");
+            stashed = true;
             checkoutBranch(githubPagesBranch, true, true);
         }
         try {
@@ -208,6 +211,9 @@ private void publishToGithubPages() throws IOException, InterruptedException {
             publishPath.getParentFile().mkdirs();
             publishToCurrentBranch(publishPath);
         } finally {
+            if (stashed) {
+                executeGitCommand("git", "stash", "pop");
+            }
             if (!currentBranch.equals(githubPagesBranch)) {
                 checkoutBranch(currentBranch, false, false);
             }