Fix changelog pr for dry run (#362)

jupyter-server · Aug 11, 2022 · 6e5b438 · 6e5b438
1 parent 55464cf
commit 6e5b438
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/jupyter_releaser/lib.py b/jupyter_releaser/lib.py
@@ -172,7 +172,10 @@ def make_changelog_pr(auth, branch, repo, title, commit_message, body, dry_run=F
         pass
     util.run(f"git checkout -b {pr_branch} origin/{branch}", echo=True)
     if dirty:
-        util.run("git stash apply", echo=True)
+        if dry_run:
+            util.run("git merge --squash --strategy-option=theirs stash", echo=True)
+        else:
+            util.run("git stash apply", echo=True)
 
     # Add a commit with the message
     try: