zeripath 0dfe5fa2d6

Detect conflicts with 3way merge (#18536) (#18537) ...

Backport #18536

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>

2022-02-02 14:35:25 +00:00

..

check_test.go

…

check.go

…

commit_status.go

…

lfs.go

…

main_test.go

…

merge.go

Restore propagation of ErrDependenciesLeft (#18325)

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 (#18004)

2021-12-19 05:19:25 +01:00

patch.go

Detect conflicts with 3way merge (#18536) (#18537)

2022-02-02 14:35:25 +00:00

pull_test.go

…

pull.go

Restore propagation of ErrDependenciesLeft (#18325)

2022-01-19 00:26:42 +01:00

review.go

Simplify parameter types (#18006)

2021-12-20 04:41:31 +00:00

temp_repo.go

…

update.go

Abort merge if head has been updated before pressing merge (#18032)

2021-12-20 08:32:54 +08:00