You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Gusted ebe569a268 Set correct PR status on 3way on conflict checking (#19457) ... * 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		3 years ago
..
check.go	Don't allow merging PR's which are being conflict checked (#19357)	3 years ago
check_test.go	Add Goroutine stack inspector to admin/monitor (#19207)	3 years ago
commit_status.go	…
lfs.go	…
main_test.go	Use a struct as test options (#19393)	3 years ago
merge.go	Move milestone to models/issues/ (#19278)	3 years ago
patch.go	Set correct PR status on 3way on conflict checking (#19457)	3 years ago
patch_unmerged.go	Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)	3 years ago
pull.go	Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)	3 years ago
pull_test.go	Append to existing trailers in generated squash commit message (#15980)	3 years ago
review.go	Move milestone to models/issues/ (#19278)	3 years ago
temp_repo.go	Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)	3 years ago
update.go	…