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

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>		5 years ago
..
check.go	Only update merge_base if not already merged (#10909)	5 years ago
check_test.go	Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)	5 years ago
commit_status.go	Fix bug on pull view when required status check no ci result (#10648) (#10651)	5 years ago
lfs.go	Add basic repository lfs management (#7199)	5 years ago
main_test.go	Move some pull request functions from models to services (#9266)	5 years ago
merge.go	Fix rebase conflict detection in git 2.26 (#10930)	5 years ago
patch.go	Generate Diff and Patch direct from Pull head (#10936) (#10938)	5 years ago
pull.go	Only update merge_base if not already merged (#10909)	5 years ago
pull_test.go	Move PushToBaseRepo from models to services/pull (#9352)	5 years ago
review.go	remove unused method and rename createcommentWithNoAction (#9367)	5 years ago
temp_repo.go	Remove SavePatch and generate patches on the fly (#9302)	5 years ago