-
Notifications
You must be signed in to change notification settings - Fork 123
The workflow needs -f flag to rebase and push on a branch #2947
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
base: main
Are you sure you want to change the base?
Conversation
[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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
@@ -37,4 +37,4 @@ jobs: | |||
git fetch origin ${{ inputs.source-branch }} | |||
git checkout ${{ inputs.target-branch }} | |||
git rebase ${{ inputs.source-branch }} | |||
git push origin ${{ inputs.target-branch }} | |||
git push origin ${{ inputs.target-branch }} -f |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
normally I prefer to use --force
just in case for easy grep, but its fine :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, that's a good point by @danpawlik Let's keep it "grep-able".
Minor thing, but improving readability. The man for git-push
is informing about the order of arguments, with -f/--force
being next to git push
. and before the repository. Please adhere to the standard.
git push [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
[--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
[-u | --set-upstream] [-o <string> | --push-option=<string>]
[--[no-]signed|--signed=(true|false|if-asked)]
[--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]
[--no-verify] [<repository> [<refspec>...]]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please see my comment.
Thank you @frenzyfriday for your improvements!
No description provided.