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 <[email protected]>

* and three-way failed

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: Lunny Xiao <[email protected]>

2022-02-02 12:46:10 +08:00

..

check_test.go

Pause queues (#15928)

2022-01-22 21:22:14 +00:00

check.go

Pause queues (#15928)

2022-01-22 21:22:14 +00:00

commit_status.go

format with gofumpt (#18184)

2022-01-20 18:46:10 +01:00

lfs.go

Propagate context and ensure git commands run in request context (#17868)

2022-01-19 23:26:57 +00:00

main_test.go

Decouple unit test code from business code (#17623)

2021-11-12 22:36:47 +08:00

merge.go

format with gofumpt (#18184)

2022-01-20 18:46:10 +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)

2022-02-02 12:46:10 +08:00

pull_test.go

Append to existing trailers in generated squash commit message (#15980)

2021-06-25 13:01:43 -04:00

pull.go

Add config options to hide issue events (#17414)

2022-01-21 18:59:26 +01:00

review.go

format with gofumpt (#18184)

2022-01-20 18:46:10 +01:00

temp_repo.go

format with gofumpt (#18184)

2022-01-20 18:46:10 +01:00

update.go

format with gofumpt (#18184)

2022-01-20 18:46:10 +01:00