You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		3 years ago
..
check.go	Use `ctx` instead of `db.DefaultContext` in some packages(routers/services/modules) (#19163)	3 years ago
check_test.go	Pause queues (#15928)	3 years ago
commit_status.go	format with gofumpt (#18184)	3 years ago
lfs.go	Propagate context and ensure git commands run in request context (#17868)	3 years ago
main_test.go	Decouple unit test code from business code (#17623)	3 years ago
merge.go	Use `ctx` instead of `db.DefaultContext` in some packages(routers/services/modules) (#19163)	3 years ago
patch.go	When conflicts have been previously detected ensure that they can be resolved (#19247)	3 years ago
patch_unmerged.go	Change git.cmd to RunWithContext (#18693)	3 years ago
pull.go	Move some issue methods as functions (#19255)	3 years ago
pull_test.go	Append to existing trailers in generated squash commit message (#15980)	3 years ago
review.go	Move some issue methods as functions (#19255)	3 years ago
temp_repo.go	Use `ctx` instead of `db.DefaultContext` in some packages(routers/services/modules) (#19163)	3 years ago
update.go	Add config option to disable "Update branch by rebase" (#18745)	3 years ago