zeripath 1eebbf23f0 When conflicts have been previously detected ensure that they can be resolved (#19247) ... There is yet another problem with conflicted files not being reset when the test patch resolves them. This PR adjusts the code for checkConflicts to reset the ConflictedFiles field immediately at the top. It also adds a reset to conflictedFiles for the manuallyMerged and a shortcut for the empty status in protectedfiles. Signed-off-by: Andrew Thornton <art27@cantab.net>		2022-03-29 18:42:34 +02:00
..
check_test.go	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
check.go	Use ctx instead of db.DefaultContext in some packages(routers/services/modules) (#19163)	2022-03-22 16:22:54 +01: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	Use ctx instead of db.DefaultContext in some packages(routers/services/modules) (#19163)	2022-03-22 16:22:54 +01:00
patch_unmerged.go	Change git.cmd to RunWithContext (#18693)	2022-02-11 13:47:22 +01:00
patch.go	When conflicts have been previously detected ensure that they can be resolved (#19247)	2022-03-29 18:42:34 +02:00
pull_test.go	Append to existing trailers in generated squash commit message (#15980)	2021-06-25 13:01:43 -04:00
pull.go	Move some issue methods as functions (#19255)	2022-03-29 16:57:33 +02:00
review.go	Move some issue methods as functions (#19255)	2022-03-29 16:57:33 +02:00
temp_repo.go	Use ctx instead of db.DefaultContext in some packages(routers/services/modules) (#19163)	2022-03-22 16:22:54 +01:00
update.go	Add config option to disable "Update branch by rebase" (#18745)	2022-03-04 03:30:49 -05:00