Git with a cup of tea, painless self-hosted git service Mirror for internal git.with.parts use https://git.with.parts

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 09adc26eb6 Set correct PR status on 3way on conflict checking (#19457) (#19458) ... - Backport #19457 - 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. - Ref: Fix the latest error for https://gitea.com/gitea/go-sdk/pulls/579 Co-authored-by: zeripath <art27@cantab.net>		3 years ago
..
check.go	Don't allow merging PR's which are being conflict checked (#19357) (#19358)	3 years ago
check_test.go	…
commit_status.go	Add missing `X-Total-Count` and fix some related bugs (#17968)	3 years ago
lfs.go	…
main_test.go	…
merge.go	Move checks for pulls before merge into own function (#19271) (#19277)	3 years ago
patch.go	Set correct PR status on 3way on conflict checking (#19457) (#19458)	3 years ago
patch_unmerged.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	3 years ago
pull.go	Restore propagation of ErrDependenciesLeft (#18325)	3 years ago
pull_test.go	…
review.go	Simplify parameter types (#18006)	3 years ago
temp_repo.go	…
update.go	Abort merge if head has been updated before pressing merge (#18032)	3 years ago