cherrypick-interactive 1.14.5 → 1.14.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli.js +5 -5
- package/package.json +1 -1
package/cli.js
CHANGED
|
@@ -1402,11 +1402,11 @@ async function main() {
|
|
|
1402
1402
|
{
|
|
1403
1403
|
type: 'list',
|
|
1404
1404
|
name: 'choice',
|
|
1405
|
-
message: 'How would you like to proceed?',
|
|
1405
|
+
message: 'Some selected commits depend on unselected commits (see above). How would you like to proceed?',
|
|
1406
1406
|
choices: [
|
|
1407
|
-
{ name: 'Include missing commits and continue', value: 'include' },
|
|
1408
|
-
{ name: 'Go back to selection', value: 'back' },
|
|
1409
|
-
{ name: '
|
|
1407
|
+
{ name: 'Include missing dependency commits and continue', value: 'include' },
|
|
1408
|
+
{ name: 'Go back to commit selection', value: 'back' },
|
|
1409
|
+
{ name: 'Skip dependencies and continue anyway (may cause conflicts)', value: 'continue' },
|
|
1410
1410
|
],
|
|
1411
1411
|
},
|
|
1412
1412
|
]);
|
|
@@ -1578,7 +1578,7 @@ async function main() {
|
|
|
1578
1578
|
|
|
1579
1579
|
log(chalk.green(`✓ package.json updated and committed: ${msg}`));
|
|
1580
1580
|
|
|
1581
|
-
await
|
|
1581
|
+
await gitRaw(['push', '-u', 'origin', releaseBranch, '--no-verify']);
|
|
1582
1582
|
|
|
1583
1583
|
const ghArgs = [
|
|
1584
1584
|
'pr',
|
package/package.json
CHANGED