6543 f7d7cf4e2d Fix rebase conflict detection in git 2.26 (#10930) ... Git changed the technique used in rebase from simple apply-patches to use merge. This breaks our conflict detection code. created by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>		2020-04-03 13:09:15 -04:00
..
check.go	Only update merge_base if not already merged (#10909)	2020-04-01 15:33:44 +03:00
check_test.go	Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)	2020-02-10 13:09:08 +00:00
commit_status.go	Fix bug on pull view when required status check no ci result (#10648) (#10651)	2020-03-07 17:32:08 +08:00
lfs.go	…
main_test.go	Move some pull request functions from models to services (#9266)	2019-12-06 21:44:10 -05:00
merge.go	Fix rebase conflict detection in git 2.26 (#10930)	2020-04-03 13:09:15 -04:00
patch.go	Generate Diff and Patch direct from Pull head (#10936) (#10938)	2020-04-03 17:06:54 +03:00
pull.go	Only update merge_base if not already merged (#10909)	2020-04-01 15:33:44 +03:00
pull_test.go	Move PushToBaseRepo from models to services/pull (#9352)	2019-12-15 04:28:51 +01:00
review.go	remove unused method and rename createcommentWithNoAction (#9367)	2019-12-16 11:54:24 +08:00
temp_repo.go	Remove SavePatch and generate patches on the fly (#9302)	2019-12-13 23:21:06 +01:00