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.

zeripath 92e81e97e8 Detect conflicts with 3way merge (#18536) ... * Detect conflicts with 3way merge Unforunately git apply --3way reports conflicts differently than standard patches resulting in conflicts being missed. Adjust the conflict detection code to account for this different error reporting. Fix #18514 Signed-off-by: Andrew Thornton <art27@cantab.net> * and three-way failed Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>		2 years ago
..
check.go	Pause queues (#15928)	2 years ago
check_test.go	Pause queues (#15928)	2 years ago
commit_status.go	format with gofumpt (#18184)	2 years ago
lfs.go	Propagate context and ensure git commands run in request context (#17868)	2 years ago
main_test.go	Decouple unit test code from business code (#17623)	3 years ago
merge.go	format with gofumpt (#18184)	2 years ago
patch.go	Detect conflicts with 3way merge (#18536)	2 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	Add config options to hide issue events (#17414)	2 years ago
pull_test.go	Append to existing trailers in generated squash commit message (#15980)	3 years ago
review.go	format with gofumpt (#18184)	2 years ago
temp_repo.go	format with gofumpt (#18184)	2 years ago
update.go	format with gofumpt (#18184)	2 years ago