ci: fix: /fast-forward triggered by non-maintainers
#54
Conversation
This file contains 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
|
你觉得可以合了就 @ 我 |
|
@CuteDress 这个可以了 |
|
那我是直接用 fast-forward 合？ |
|
都行吧 |
|
还是手动 rebase merge 吧 |
|
Triggered from #54 (comment) by @CuteDress. Trying to fast forward Target branch ( commit ca9919a19b30f25e6bcf53f3574934eda62ff5a3 (HEAD -> master, origin/master, origin/HEAD)
Author: LY <[email protected]>
Date: Mon Jan 1 14:34:00 2024 +0800
chore: don't treat `*.sig` GPG signatures as `Standard ML`
ref:
<https://github.com/github-linguist/linguist/issues/1298>
<https://github.com/biergaizi/raspberrypi-sources/pull/1>Pull request ( commit 18cbf54710c224cfc24b69fbd97f40a054db7cfe (pull_request/patch-4)
Author: LY <[email protected]>
Date: Mon Jan 1 15:11:13 2024 +0800
ci: fix: `/fast-forward` triggered by non-maintainersFast forwarding $ git push origin 18cbf54710c224cfc24b69fbd97f40a054db7cfe:master
To https://github.com/Cute-Dress/Dress.git
! [remote rejected] 18cbf54710c224cfc24b69fbd97f40a054db7cfe -> master (refusing to allow a GitHub App to create or update workflow `.github/workflows/fast-forward.yml` without `workflows` permission)
error: failed to push some refs to 'https://github.com/Cute-Dress/Dress.git' |
|
改了 ci，fast-forward 不了（ |
确实，现在仓库太大不方便 clone，我也是直接在网页上操作的 |
|
顺带一提，这个 |
似乎在 review 的 approve 中带有 |
|
Thank you！
Hope toI continue to cooperate on this project!
种自己的花，爱自己的宇宙?
***@***.***
…------------------ 原始邮件 ------------------
发件人: "Cute-Dress/Dress" ***@***.***>;
发送时间: 2024年2月7日(星期三) 中午11:11
***@***.***>;
***@***.***>;
主题: Re: [Cute-Dress/Dress] ci: fix: `/fast-forward` triggered by non-maintainers (PR #54)
Triggered from #54 (comment) by @CuteDress.
Trying to fast forward master (d53930a) to patch-4 (18cbf54).
Target branch (master):
commit d53930a (HEAD -> master, origin/master, origin/HEAD) Author: CuteDress ***@***.***> Date: Wed Feb 7 11:04:34 2024 +0800 Delete Souiken/IMG_0764.png 似乎是转完没删的文件
Pull request (patch-4):
commit 18cbf54 (pull_request/patch-4) Author: LY ***@***.***> Date: Mon Jan 1 15:11:13 2024 +0800 ci: fix: `/fast-forward` triggered by non-maintainers
Can't fast forward master (d53930a) to patch-4 (18cbf54). master (d53930a) is not a direct ancestor of patch-4 (18cbf54). Branches appear to have diverged at ca9919a:
* d53930a Delete Souiken/IMG_0764.png * 6f10663 upload pictures * 6843f8d 不要在网上乱买丝袜，很透面料质量贼差，都原图直出，很一般不好穿出去 * 392bcb5 A.R.O.N.Aのplana COS照片 * a2e8bfd feat(MingxuanGame): upload pictures * 6bfad69 JK-uniform * 8b4a2dd ci: fix: `/fast-forward` triggered by non-maintainers | * 18cbf54 ci: fix: `/fast-forward` triggered by non-maintainers |/ * ca9919a chore: don't treat `*.sig` GPG signatures as `Standard ML` commit ca9919a Author: LY ***@***.***> Date: Mon Jan 1 14:34:00 2024 +0800 chore: don't treat `*.sig` GPG signatures as `Standard ML` ref: <github-linguist/linguist#1298> <biergaizi/raspberrypi-sources#1>
Rebase locally, and then force push to patch-4.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://github.com/actions-cool/issues-helper?tab=readme-ov-file#check-issue