Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit af905c0

Browse files
Override all conflicting custom values with the expected Magento default values
1 parent 9f28563 commit af905c0

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/guides/v2.3/comp-mgr/cli/cli-upgrade.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ See the examples at the end of this section for help specifying different releas
7676
The first time you upgrade using the plugin, you can interactively view and update any out-of-date values that may be remaining from previous versions.
7777
To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
7878

79+
To override all conflicting custom values with the expected Magento values, re-run the `composer require` command with the `--use-default-magento-values` option.
80+
7981
{:.bs-callout-tip}
8082
Use `composer require --help` to learn more about available options.
8183
To learn more about usage of the plugin, refer to the [Plugin Usage](https://github.com/magento/composer-root-update-plugin/blob/0.1/src/Magento/ComposerRootUpdatePlugin/README.md#usage).

src/guides/v2.4/comp-mgr/cli/cli-upgrade.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ See the examples at the end of this section for help specifying different releas
7878
The first time you upgrade using the plugin, you can interactively view and update any out-of-date values that may be remaining from previous versions.
7979
To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
8080

81+
To override all conflicting custom values with the expected Magento values, re-run the `composer require` command with the `--use-default-magento-values` option.
82+
8183
{:.bs-callout-tip}
8284
Use `composer require --help` to learn more about available options.
8385
To learn more about usage of the plugin, refer to the [Plugin Usage](https://github.com/magento/composer-root-update-plugin/blob/0.1/src/Magento/ComposerRootUpdatePlugin/README.md#usage).

0 commit comments

Comments
 (0)