Workflow: add rebase code after checkout #4827
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Syspretor
force-pushed
the
workflow/add-code-rebase-after-checkout
branch
3 times, most recently
from
563bb47 to
2a61dc8
Compare
Signed-off-by: 玖宇 <guotongyu.gty@alibaba-inc.com>
Syspretor
force-pushed
the
workflow/add-code-rebase-after-checkout
branch
from
2a61dc8 to
471bdb6
Compare
|
TrafalgarZZZ
reviewed
Apr 8, 2025
| # Check if the current branch contains the latest master commit | ||
| MASTER_COMMIT=$(git rev-parse origin/master) | ||
| if ! git merge-base --is-ancestor $MASTER_COMMIT HEAD; then | ||
| echo "::error ::Current branch is not up-to-date with master. Please rebase." |
Member
There was a problem hiding this comment.
Better to provide a command like:
Suggested change
| echo "::error ::Current branch is not up-to-date with master. Please rebase." | |
| echo "::error ::Current branch is not up-to-date with master. Please rebase with `git fetch origin master && git rebase origin/master`" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR does
Ⅱ. Does this pull request fix one issue?
fixes #XXXX
Ⅲ. List the added test cases (unit test/integration test) if any, please explain if no tests are needed.
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews