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

..

admin

New cron task: delete old system notices (#19219)

2022-03-28 13:54:59 +01:00

appstate

…

asymkey

Fix the bug: deploy key with write access can not push (#19010)

2022-03-22 17:29:07 +08:00

auth

…

avatars

…

db

…

fixtures

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

foreignreference

Store the foreign ID of issues during migration (#18446)

2022-03-17 18:08:35 +01:00

issues

Show fullname on issue edits and gpg/ssh signing info (#18827)

2022-02-20 19:50:11 +00:00

migrations

nit fix (#19116)

2022-03-17 20:04:36 +02:00

organization

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

perm

…

project

Move project files into models/project sub package (#17704)

2022-03-29 22:16:31 +08:00

repo

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

unit

…

unittest

…

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

access_test.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

access.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

action_list.go

RSS/Atom support for Repos (#19055)

2022-03-13 17:40:47 +01:00

action_test.go

RSS/Atom support for Repos (#19055)

2022-03-13 17:40:47 +01:00

action.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

branches_test.go

…

branches.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

commit_status_test.go

…

commit_status.go

…

commit.go

…

consistency_test.go

…

consistency.go

…

engine_test.go

…

error.go

Move project files into models/project sub package (#17704)

2022-03-29 22:16:31 +08:00

fixture_generation.go

…

fixture_test.go

…

helper_directory.go

…

helper_environment.go

Fix the bug: deploy key with write access can not push (#19010)

2022-03-22 17:29:07 +08:00

helper.go

…

issue_assignees_test.go

Move some issue methods as functions (#19255)

2022-03-29 16:57:33 +02:00

issue_assignees.go

Move some issue methods as functions (#19255)

2022-03-29 16:57:33 +02:00

issue_comment_list.go

…

issue_comment_test.go

…

issue_comment.go

Move some issue methods as functions (#19255)

2022-03-29 16:57:33 +02:00

issue_dependency_test.go

Move some issue methods as functions (#19255)

2022-03-29 16:57:33 +02:00

issue_dependency.go

…

issue_label_test.go

Move init repository related functions to modules (#19159)

2022-03-29 15:23:45 +08:00

issue_label.go

Move init repository related functions to modules (#19159)

2022-03-29 15:23:45 +08:00

issue_list_test.go

…

issue_list.go

…

issue_lock.go

…

issue_milestone_test.go

…

issue_milestone.go

…

issue_project.go

Move project files into models/project sub package (#17704)

2022-03-29 22:16:31 +08:00

issue_reaction_test.go

…

issue_reaction.go

…

issue_stopwatch_test.go

…

issue_stopwatch.go

…

issue_test.go

Move some issue methods as functions (#19255)

2022-03-29 16:57:33 +02:00

issue_tracked_time_test.go

Refactor SecToTime() function (#18863)

2022-02-28 23:57:20 +01:00

issue_tracked_time.go

…

issue_user_test.go

…

issue_user.go

…

issue_watch_test.go

…

issue_watch.go

…

issue_xref_test.go

Move some issue methods as functions (#19255)

2022-03-29 16:57:33 +02:00

issue_xref.go

Lock gofumpt to v0.3.0 and run it (#18866)

2022-02-23 20:16:07 +00:00

issue.go

Move some issue methods as functions (#19255)

2022-03-29 16:57:33 +02:00

lfs_lock.go

…

lfs.go

Improve SyncMirrors logging (#19045)

2022-03-10 10:09:48 +00:00

main_test.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

migrate_test.go

Store the foreign ID of issues during migration (#18446)

2022-03-17 18:08:35 +01:00

migrate.go

Store the foreign ID of issues during migration (#18446)

2022-03-17 18:08:35 +01:00

notification_test.go

…

notification.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

org_team_test.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

org_team.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

org_test.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

org.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

protected_tag_test.go

…

protected_tag.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

pull_list.go

…

pull_test.go

…

pull.go

When conflicts have been previously detected ensure that they can be resolved (#19247)

2022-03-29 18:42:34 +02:00

release.go

…

repo_activity.go

…

repo_collaboration_test.go

…

repo_collaboration.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

repo_generate_test.go

…

repo_generate.go

Move init repository related functions to modules (#19159)

2022-03-29 15:23:45 +08:00

repo_list_test.go

…

repo_list.go

…

repo_permission_test.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

repo_permission.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

repo_test.go

Allow users to self-request a PR review (#19030)

2022-03-08 22:48:47 +01:00

repo_transfer_test.go

…

repo_transfer.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

repo.go

Move project files into models/project sub package (#17704)

2022-03-29 22:16:31 +08:00

review_test.go

…

review.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

statistic.go

Move project files into models/project sub package (#17704)

2022-03-29 22:16:31 +08:00

task.go

…

token_test.go

…

token.go

…

upload.go

…

user_heatmap_test.go

RSS/Atom support for Repos (#19055)

2022-03-13 17:40:47 +01:00

user_heatmap.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

user_test.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

user.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

userlist_test.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00

userlist.go

Move organization related structs into sub package (#18518)

2022-03-29 14:29:02 +08:00