mirror of
https://github.com/go-gitea/gitea
synced 2024-12-25 22:14:36 +01:00
431e482e3f
Although #18004 will seriously reduce the likelihood of finding conflicts in the first place - one bug was introduced whereby the conflicted files status was not being reset properly. This leads to conflicted PRs remaining conflicted when the conflict has been resolved. Signed-off-by: Andrew Thornton <art27@cantab.net> |
||
|---|---|---|
| .. | ||
| agit | ||
| asymkey | ||
| attachment | ||
| auth | ||
| comments | ||
| cron | ||
| externalaccount | ||
| forms | ||
| gitdiff | ||
| issue | ||
| lfs | ||
| mailer | ||
| migrations | ||
| mirror | ||
| org | ||
| pull | ||
| release | ||
| repository | ||
| task | ||
| user | ||
| webhook | ||
| wiki | ||