update release_do_nothing script (#5311)

bjlittle · web-flow · commit b03509480c5c · 2023-05-09T15:15:38.000+01:00
diff --git a/tools/release_do_nothing.py b/tools/release_do_nothing.py
@@ -674,7 +674,7 @@ def merge_back(
         message = (
             f"Merge in the commits from {release_strings.branch}.\n"
             f"{merge_commit}\n"
-            f"git merge upstream/{release_strings.branch} --no-ff"
+            f"git merge upstream/{release_strings.branch} --no-ff "
             '-m "Merging release branch into main";'
         )
         _wait_for_done(message)

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ def merge_back(`
`674`	`674`	`message = (`
`675`	`675`	`f"Merge in the commits from {release_strings.branch}.\n"`
`676`	`676`	`f"{merge_commit}\n"`
`677`		`- f"git merge upstream/{release_strings.branch} --no-ff"`
	`677`	`+ f"git merge upstream/{release_strings.branch} --no-ff "`
`678`	`678`	`'-m "Merging release branch into main";'`
`679`	`679`	`)`
`680`	`680`	`_wait_for_done(message)`