You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
res=awaitconfirm("No notable changes since the previous release.\nContinue the release process?",["yes","[no]"]);
200
+
res=awaitconfirm("No notable changes since the parent release.\nContinue the release process?",["yes","[no]"]);
201
201
202
202
if(res!=="yes")returnresult([400,"Terminated"]);
203
203
}
@@ -228,7 +228,7 @@ export default class Publish {
228
228
// prepare release branch
229
229
if(this.#originalBranch ){
230
230
231
-
// merge the previous release branch with the original branch
231
+
// merge the original branch to the parent release branch
232
232
if(this.#parentRelease ){
233
233
res=awaitthis.#execGitCommand(`Switching to the branch "${this.#parentReleaseBranch }"`,["switch",this.#parentReleaseBranch ],{"repeatOnError": false});
234
234
if(!res.ok)returnres;
@@ -251,7 +251,7 @@ export default class Publish {
251
251
res=awaitthis.#execGitCommand(`Creating and switching to the new release branch "${this.#newReleaseBranch }"`,["switch","--create",this.#newReleaseBranch ],{"repeatOnError": false});
252
252
if(!res.ok)returnres;
253
253
254
-
// move previous release branch head
254
+
// move parent release branch head
255
255
if(this.#parentRelease ){
256
256
res=awaitthis.#execGitCommand(
257
257
`Moving branch head "${this.#parentReleaseBranch }" to the release "${this.#parentRelease.versionString}"`,
0 commit comments