Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 4 deletions

diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 422bf52a1fa..8f041d1e670 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -393,7 +393,7 @@ export default {
             v-else-if="conflictResolutionPath"
             :message="
               __(
-                'You can %{gitlabLinkStart}resolve conflicts on GitLab%{gitlabLinkEnd} or %{resolveLocallyStart}resolve it locally%{resolveLocallyEnd}.',
+                'You can %{gitlabLinkStart}resolve conflicts on GitLab%{gitlabLinkEnd} or %{resolveLocallyStart}resolve them locally%{resolveLocallyEnd}.',
               )
             "
           >
@@ -415,7 +415,7 @@ export default {
           </gl-sprintf>
           <gl-sprintf
             v-else
-            :message="__('You can %{resolveLocallyStart}resolve it locally%{resolveLocallyEnd}.')"
+            :message="__('You can %{resolveLocallyStart}resolve them locally%{resolveLocallyEnd}.')"
           >
             <template #resolveLocally="{ content }">
               <gl-button
diff --git a/app/assets/javascripts/diffs/utils/tree_worker_utils.js b/app/assets/javascripts/diffs/utils/tree_worker_utils.js
index 985e75d1a17..a90c1a5c64e 100644
--- a/app/assets/javascripts/diffs/utils/tree_worker_utils.js
+++ b/app/assets/javascripts/diffs/utils/tree_worker_utils.js
@@ -62,10 +62,15 @@ export const generateTreeList = (files) => {
       const split = file.new_path.split('/');
 
       split.forEach((name, i) => {
-        const parent = acc.treeEntries[split.slice(0, i).join('/')];
+        let parent = acc.treeEntries[split.slice(0, i).join('/')];
         const path = `${parent ? `${parent.path}/` : ''}${name}`;
+        const child = acc.treeEntries[path];
 
-        if (!acc.treeEntries[path]) {
+        if (parent && !parent.tree) {
+          parent = null;
+        }
+
+        if (!child || !child.tree) {
           const type = path === file.new_path ? 'blob' : 'tree';
           acc.treeEntries[path] = {
             key: path,