1 files changed, 13 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/stores/mutations.js b/app/assets/javascripts/ide/stores/mutations.js
index ec4c2fdcde2..ea125214ebb 100644
--- a/app/assets/javascripts/ide/stores/mutations.js
+++ b/app/assets/javascripts/ide/stores/mutations.js
@@ -56,6 +56,11 @@ export default {
       stagedFiles: [],
     });
   },
+  [types.CLEAR_REPLACED_FILES](state) {
+    Object.assign(state, {
+      replacedFiles: [],
+    });
+  },
   [types.SET_ENTRIES](state, entries) {
     Object.assign(state, {
       entries,
@@ -70,6 +75,13 @@ export default {
         Object.assign(state.entries, {
           [key]: entry,
         });
+      } else if (foundEntry.deleted) {
+        Object.assign(state.entries, {
+          [key]: {
+            ...entry,
+            replaces: true,
+          },
+        });
       } else {
         const tree = entry.tree.filter(
           f => foundEntry.tree.find(e => e.path === f.path) === undefined,
@@ -144,6 +156,7 @@ export default {
       raw: file.content,
       changed: Boolean(changedFile),
       staged: false,
+      replaces: false,
       prevPath: '',
       moved: false,
       lastCommitSha: lastCommit.commit.id,