Skip to content

Start automerge check again after the conflict check and the schedule #35002

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

Jump to bottom
Merged
merged 2 commits into from
Jul 10, 2025
Merged

Start automerge check again after the conflict check and the schedule #35002

merged 2 commits into from
Jul 10, 2025

Conversation

lunny
Copy link
Member

@lunny lunny commented Jul 8, 2025 •
edited
Loading

Fix #34988
Backport #34989

Co-authored-by: posativ

@lunny lunny added the type/bug label Jul 8, 2025
@GiteaBot GiteaBot added this to the 1.24.3 milestone Jul 8, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 8, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jul 8, 2025
@lunny lunny requested a review from wxiaoguang July 9, 2025 17:26
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 10, 2025
@lunny lunny mentioned this pull request Jul 10, 2025
Merged
@wxiaoguang wxiaoguang enabled auto-merge (squash) July 10, 2025 02:11
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 10, 2025
@wxiaoguang wxiaoguang merged commit e931b62 into go-gitea:release/v1.24 Jul 10, 2025
26 checks passed
@lunny lunny deleted the lunny/backport_34989 branch July 10, 2025 03:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

+1 more reviewer

@hiifong hiifong hiifong approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code type/bug
Projects
None yet
Milestone
1.24.3
Development

Successfully merging this pull request may close these issues.
4 participants
@lunny @wxiaoguang @hiifong @GiteaBot