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
..
agit	Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)	2022-02-06 20:01:47 +01:00
asymkey	Use ctx instead of db.DefaultContext in some packages(routers/services/modules) (#19163)	2022-03-22 16:22:54 +01:00
attachment	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
auth	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
comments	Move some issue methods as functions (#19255)	2022-03-29 16:57:33 +02:00
context	Add ContextUser to http request context (#18798)	2022-03-26 17:04:22 +08:00
cron	Show last cron messages on monitor page (#19223)	2022-03-29 02:31:07 +01:00
externalaccount	Refactor auth package (#17962)	2022-01-02 21:12:35 +08:00
forms	Move project files into models/project sub package (#17704)	2022-03-29 22:16:31 +08:00
gitdiff	rm .sample hooks which aren't used (#19101)	2022-03-16 10:33:07 +00:00
issue	Move some issue methods as functions (#19255)	2022-03-29 16:57:33 +02:00
lfs	Update HTTP status codes to modern codes (#18063)	2022-03-23 12:54:07 +08:00
mailer	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
migrations	Update HTTP status codes to modern codes (#18063)	2022-03-23 12:54:07 +08:00
mirror	Touch mirrors on even on fail to update (#19217)	2022-03-27 15:40:17 +01:00
org	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
pull	When conflicts have been previously detected ensure that they can be resolved (#19247)	2022-03-29 18:42:34 +02:00
release	Use ctx instead of db.DefaultContext in some packages(routers/services/modules) (#19163)	2022-03-22 16:22:54 +01:00
repository	Move init repository related functions to modules (#19159)	2022-03-29 15:23:45 +08:00
task	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
user	Move organization related structs into sub package (#18518)	2022-03-29 14:29:02 +08:00
webhook	Only send webhook events to active system webhooks and only deliver to active hooks (#19234)	2022-03-28 11:17:21 +08:00
wiki	Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)	2022-02-06 20:01:47 +01:00