Don't allow merging PR's which are being conflict checked#19357

Merged

6543 merged 8 commits into

go-gitea:mainfrom

Gusted:prevent-conflict-checking-pr

Apr 20, 2022

Commits on Apr 9, 2022

Don't allow merging PR's which are being conflict checked
Gusted
committed
Fix grammar
Gusted
committed
Improve error message

Gusted
and
delvh
authored

Commits on Apr 10, 2022

Merge branch 'main' into prevent-conflict-checking-pr
lafriks
authored

Commits on Apr 12, 2022

Merge branch 'main' into prevent-conflict-checking-pr
lunny
authored

Commits on Apr 15, 2022

Merge branch 'main' into prevent-conflict-checking-pr
lunny
authored

Commits on Apr 20, 2022