mirror of
https://github.com/go-gitea/gitea
synced 2024-08-18 13:20:51 +02:00
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> |
||
---|---|---|
.. | ||
check_test.go | ||
check.go | ||
commit_status.go | ||
lfs.go | ||
main_test.go | ||
merge.go | ||
patch_unmerged.go | ||
patch.go | ||
pull_test.go | ||
pull.go | ||
review.go | ||
temp_repo.go | ||
update.go |