Merge pull request #9153 from #9153

[Imported] Override all conflicting custom values with the expected Magento default values for command line upgrade

Author: dobooth

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

@@ -76,6 +76,8 @@ See the examples at the end of this section for help specifying different releas
    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.
    To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
 
+   To override all conflicting custom values with the expected Magento values, re-run the `composer require` command with the `--use-default-magento-values` option.
+
    {:.bs-callout-tip}
    Use `composer require --help` to learn more about available options.
    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

@@ -78,6 +78,8 @@ See the examples at the end of this section for help specifying different releas
    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.
    To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
 
+   To override all conflicting custom values with the expected Magento values, re-run the `composer require` command with the `--use-default-magento-values` option.
+
    {:.bs-callout-tip}
    Use `composer require --help` to learn more about available options.
    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).