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.

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

Print a clearer error message when flag-config and non-flag-config files are in the same PR #9166

Merged
merged 6 commits into from
May 5, 2017
Merged

Print a clearer error message when flag-config and non-flag-config files are in the same PR #9166

merged 6 commits into from
May 5, 2017

Conversation

rsimha
Copy link
Contributor

@rsimha rsimha commented May 5, 2017

From time to time, people hit this error because of a really old branch and wonder what this error is all about. Make the error text easier to spot and easier to understand.

@rsimha rsimha requested a review from lannka May 5, 2017 16:39
@rsimha rsimha mentioned this pull request May 5, 2017
@rsimha rsimha requested a review from aghassemi May 5, 2017 18:12
@rsimha
Copy link
Contributor Author

rsimha commented May 5, 2017

@lannka / @aghassemi, this should make the failure message less cryptic. Could one of you please merge this after review? (I don't have merge permissions yet.)

console.log('Please make your changes in separate pull requests.');
console.log(util.colors.yellow(
'NOTE: If you see a long list of unrelated files below, it is ' +
'likely because your branch is very old.'));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"likely because you need to resync your branch"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mentioned in the next sentence. I've reworded it anyway. Done.

Copy link
Contributor

@aghassemi aghassemi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make a reminder to remove the second part of the message after a few months.

@aghassemi aghassemi merged commit 164fc44 into ampproject:master May 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants