1
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-01 14:56:30 +00:00
gitea/services/pull
zeripath 0dfe5fa2d6
Detect conflicts with 3way merge () ()
Backport 

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 

Signed-off-by: Andrew Thornton <art27@cantab.net>
2022-02-02 14:35:25 +00:00
..
check_test.go Decouple unit test, remove intermediate unittestbridge package () 2021-11-16 16:53:21 +08:00
check.go Move repository model into models/repo () 2021-12-10 09:27:50 +08:00
commit_status.go Add missing X-Total-Count and fix some related bugs () 2021-12-15 13:39:34 +08:00
lfs.go Move repository model into models/repo () 2021-12-10 09:27:50 +08:00
main_test.go Decouple unit test code from business code () 2021-11-12 22:36:47 +08:00
merge.go Restore propagation of ErrDependenciesLeft () 2022-01-19 00:26:42 +01:00
patch_unmerged.go Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality () 2021-12-19 05:19:25 +01:00
patch.go Detect conflicts with 3way merge () () 2022-02-02 14:35:25 +00:00
pull_test.go Append to existing trailers in generated squash commit message () 2021-06-25 13:01:43 -04:00
pull.go Restore propagation of ErrDependenciesLeft () 2022-01-19 00:26:42 +01:00
review.go Simplify parameter types () 2021-12-20 04:41:31 +00:00
temp_repo.go Move repository model into models/repo () 2021-12-10 09:27:50 +08:00
update.go Abort merge if head has been updated before pressing merge () 2021-12-20 08:32:54 +08:00