Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Suggest git apply --reject for failed upgrades #18636

Closed
wants to merge 1 commit into from
Closed

Suggest git apply --reject for failed upgrades #18636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion react-native-git-upgrade/cliEntry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,9 @@ async function run(requestedVersion, cliArgs) {
} catch (err) {
log.warn(
'The upgrade process succeeded but there might be conflicts to be resolved. ' +
'See above for the list of files that have merge conflicts.');
'See above for the list of files that have merge conflicts. ' +
'If you don’t see the expected changes, try running:\n' +
`git apply --reject ${patchPath}`);
} finally {
log.info('Upgrade done');
if (cliArgs.verbose) {
Expand Down