3 people e931b62f33 Start automerge check again after the conflict check and the schedule (#35002) ...

Fix #34988
Backport #34989 

Co-authored-by: posativ

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

2025-07-10 02:37:15 +00:00

..

check_test.go

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

2025-07-10 02:37:15 +00:00

check.go

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

2025-07-10 02:37:15 +00:00

comment.go

…

commit_status_test.go

Fix required contexts and commit status matching bug (#34815) (#34829)

2025-06-24 07:15:25 +08:00

commit_status.go

Fix required contexts and commit status matching bug (#34815) (#34829)

2025-06-24 07:15:25 +08:00

edits.go

…

lfs.go

…

main_test.go

…

merge_ff_only.go

…

merge_merge.go

…

merge_prepare.go

Option to delay conflict checking of old pull requests until page view (#27779)

2025-04-24 19:26:57 +00:00

merge_rebase.go

…

merge_squash.go

Always use an empty line to separate the commit message and trailer (#34512) (#34578)

2025-06-02 15:59:10 +08:00

merge_test.go

Always use an empty line to separate the commit message and trailer (#34512) (#34578)

2025-06-02 15:59:10 +08:00

merge.go

Always use an empty line to separate the commit message and trailer (#34512) (#34578)

2025-06-02 15:59:10 +08:00

patch_unmerged.go

…

patch.go

Option to delay conflict checking of old pull requests until page view (#27779)

2025-04-24 19:26:57 +00:00

protected_branch.go

…

pull_test.go

…

pull.go

Fix wrong review requests when updating the pull request (#34286)

2025-04-28 22:57:56 +00:00

review_test.go

…

review.go

…

reviewer_test.go

…

reviewer.go

Fix team permissions (#34827) (#34836)

2025-06-24 14:17:14 +00:00

temp_repo.go

Option to delay conflict checking of old pull requests until page view (#27779)

2025-04-24 19:26:57 +00:00

update_rebase.go

…

update.go

Fix possible pull request broken when leave the page immediately after clicking the update button (#34509) (#34607)

2025-06-05 07:15:32 +00:00