Skip to content

[ci] Clarify wording in ensure script output #7512

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

Merged
jimschubert merged 3 commits into from
Oct 2, 2020
Merged

[ci] Clarify wording in ensure script output #7512

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e95858a
[ci] Clarify wording in ensure script output
jimschubert Sep 26, 2020
f484212
Update wording in ensure-up-to-date
jimschubert Oct 2, 2020
d435d28
Add another newline before new message
jimschubert Oct 2, 2020
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
3 changes: 3 additions & 0 deletions bin/utils/ensure-up-to-date
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ if [ -n "$(git status --porcelain)" ]; then
git --no-pager diff
echo "Perform git status"
git status
echo -e "\nThis script runs in pull requests against the anticipated merge commit (as if the PR was merged now)."
echo "When you see unexpected files here, it likely means that there are newer commits in master that you need to "
echo -e "rebase or merge into your branch.\n"
echo "Please run 'bin/utils/ensure-up-to-date' locally and commit changes (UNCOMMITTED CHANGES ERROR)"
exit 1
else
Expand Down