Skip to content

Commit 6ade544

Browse files
authored
[ci] Clarify wording in ensure script output (#7512)
1 parent 150e24d commit 6ade544

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

bin/utils/ensure-up-to-date

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ if [ -n "$(git status --porcelain)" ]; then
5353
git --no-pager diff
5454
echo "Perform git status"
5555
git status
56+
echo -e "\nThis script runs in pull requests against the anticipated merge commit (as if the PR was merged now)."
57+
echo "When you see unexpected files here, it likely means that there are newer commits in master that you need to "
58+
echo -e "rebase or merge into your branch.\n"
5659
echo "Please run 'bin/utils/ensure-up-to-date' locally and commit changes (UNCOMMITTED CHANGES ERROR)"
5760
exit 1
5861
else

0 commit comments

Comments
 (0)