From 9d2079c112e8b6a6862b45bb2da50e31416c3e11 Mon Sep 17 00:00:00 2001
From: Edgard Lorraine Messias <edgardmessias@gmail.com>
Date: Mon, 4 Dec 2017 17:47:33 -0200
Subject: [PATCH] Removed conflict files from not tracked files

---
 src/repository.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/repository.ts b/src/repository.ts
index a157a58f..81b6b83f 100644
--- a/src/repository.ts
+++ b/src/repository.ts
@@ -160,6 +160,14 @@ export class Repository {
           changes.push(new Resource(this.workspaceRoot, status[1], "conflict"));
           break;
         case "?":
+          let matches = status[1].match(/(.*)\.(mine|r\w+)$/);
+          if (
+            matches &&
+            matches[1] &&
+            statuses.some(s => s[1] === matches[1])
+          ) {
+            break;
+          }
           notTracked.push(
             new Resource(this.workspaceRoot, status[1], "unversioned")
           );