Add UI-based merge conflict resolution

custom/options/locale/locale_en-US.ini

@@ -1986,6 +1986,7 @@ pulls.change_target_branch_at = `changed target branch from <b>%s</b> to <b>%s</
 pulls.tab_conversation = Conversation
 pulls.tab_commits = Commits
 pulls.tab_files = Changes
+pulls.tab_conflicts = Conflicts
 pulls.reopen_to_merge = Please reopen this change request to perform a merge.
 pulls.cant_reopen_deleted_branch = This change request cannot be reopened because the branch was deleted.
 pulls.merged = Merged
@@ -2000,7 +2001,8 @@ pulls.still_in_progress = Still in progress?
 pulls.add_prefix = Add <strong>%s</strong> prefix
 pulls.remove_prefix = Remove <strong>%s</strong> prefix
 pulls.data_broken = This change request is broken due to missing fork information.
-pulls.files_conflicted = This change request has changes conflicting with the target branch.
+pulls.files_conflicted = This change has conflicts that must be resolved.
+pulls.files_conflicted_help = Use the <a href="%s">Editor tab</a> to resolve conflicts.
 pulls.is_checking = Checking for merge conflicts…
 pulls.is_ancestor = "This branch is already included in the target branch. There is nothing to merge."
 pulls.is_empty = "The changes on this branch are already on the target branch. This will be an empty commit."
@@ -2014,8 +2016,11 @@ pulls.blocked_by_official_review_requests = "This change request has official re
 pulls.blocked_by_outdated_branch = "This change request is blocked because it's outdated."
 pulls.blocked_by_changed_protected_files_1= "This change request is blocked because it changes a protected file:"
 pulls.blocked_by_changed_protected_files_n= "This change request is blocked because it changes protected files:"
-pulls.can_auto_merge_desc = This change request has no conflicts with the latest article.
+pulls.can_auto_merge_desc = This change request has no conflicts with other change requests
 pulls.can_auto_merge_desc_detail = Merging can be performed automatically.
+pulls.merge_permission_desc = Only those with <a href="%[1]s/settings/collaboration">write access</a> to this repository can merge change requests.
+pulls.resolve_conflicts = Resolve conflicts
+
 pulls.cannot_auto_merge_desc = This change request cannot be merged automatically due to conflicts.
 pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts.
 pulls.num_conflicting_files_1 = "%d conflicting file"
@@ -2740,6 +2745,8 @@ diff.parent = parent
 diff.commit = commit
 diff.git-notes = Notes
 diff.data_not_available = Diff Content Not Available
+diff.conflicts_count_1 = %d conflicted file
+diff.conflicts_count_n = %d conflicted files
 diff.options_button = Diff Options
 diff.download_patch = Download Patch File
 diff.download_diff = Download Diff File
@@ -2793,8 +2800,8 @@ diff.review.reject_desc = Submit feedback that must be addressed before approvin
 diff.review.close = Close
 diff.review.close_desc = Submit feedback and close the change request without approving.
 diff.review.submit = Submit review
-diff.split_header.current = Current article
-diff.split_header.requested = Change requested
+diff.split_header.current = Current live article
+diff.split_header.requested = Your changes
 pulls.back = Back
 diff.committed_by = committed by
 diff.protected = Protected

custom/public/assets/css/base.custom.css

@@ -45,10 +45,16 @@
 	height: 18px;
 }
 
+.item .circle svg,
 .circle.small svg {
 	scale: .8;
 }
 
+.timeline-avatar.circle {
+  width: 32px !important;
+  height: 32px !important;
+}
+
 .circle.green-light-1 {
 	color: var(--color-white);
 	background-color: var(--color-green-light-1);

custom/public/assets/css/colors.custom.css

@@ -14,6 +14,7 @@ gitea-theme-meta-info {
   --color-muted: #F6F8FA;
   --color-muted-text: #59636E;
   --color-text-light-3: #59636E;
+  --color-muted-1: #818B981F;
 
   --color-warning-border: #d4a72c66;
   --color-warning-text: #9A6700;

custom/public/assets/css/menu.custom.css

@@ -19,6 +19,11 @@
   border-radius: var(--border-radius-medium) var(--border-radius-medium) 0 0 !important;
 }
 
+.ui.tabular.menu .active.item .label{
+	background-color: var(--color-text-light-2);
+  color: var(--color-primary-contrast);
+}
+
 .ui.menu .item > .svg {
   margin-right: 0.5rem;
 }