Платформа ЦРНП "Мирокод" для разработки проектов https://git.mirocod.ru

giteagithubgogolangmirocodproject-treeuser-maptask-tree

Tree: a13d64bf98

Platform_Mirocod/services/pull

History

zeripath 0dfe5fa2d6 Detect conflicts with 3way merge (#18536 An error occurred ) (#18537 An error occurred ) ... Backport #18536 An error occurred 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 An error occurred Signed-off-by: Andrew Thornton <art27@cantab.net>		3 years ago
..
check.go	Move repository model into models/repo (#17933 An error occurred )	3 years ago
check_test.go	…
commit_status.go	Add missing `X-Total-Count` and fix some related bugs (#17968 An error occurred )	3 years ago
lfs.go	Move repository model into models/repo (#17933 An error occurred )	3 years ago
main_test.go	…
merge.go	Restore propagation of ErrDependenciesLeft (#18325 An error occurred )	3 years ago
patch.go	Detect conflicts with 3way merge (#18536 An error occurred ) (#18537 An error occurred )	3 years ago
patch_unmerged.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004 An error occurred )	3 years ago
pull.go	Restore propagation of ErrDependenciesLeft (#18325 An error occurred )	3 years ago
pull_test.go	…
review.go	Simplify parameter types (#18006 An error occurred )	3 years ago
temp_repo.go	Move repository model into models/repo (#17933 An error occurred )	3 years ago
update.go	Abort merge if head has been updated before pressing merge (#18032 An error occurred )	3 years ago