mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-25 21:44:20 -04:00
* Set correct PR status on 3way on conflict checking - When 3-way merge is enabled for conflict checking, it has a new interesting behavior that it doesn't return any error when it found a conflict, so we change the condition to not check for the error, but instead check if conflictedfiles is populated, this fixes a issue whereby PR status wasn't correctly on conflicted PR's. - Refactor the mergeable property(which was incorrectly set and lead me this bug) to be more maintainable. - Add a dedicated test for conflicting checking, so it should prevent future issues with this. * Fix linter |
||
---|---|---|
.. | ||
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 |