Add additional edge case for when there are no conflicts

1 files changed, 5 insertions, 1 deletions

diff --git a/conflict/parse.go b/conflict/parse.go
index 5194e37..6bf4e96 100644
--- a/conflict/parse.go
+++ b/conflict/parse.go
@@ -175,6 +175,11 @@ func Find() (err error) {
 		}
 	}
 
+	Count = len(All)
+	if Count == 0 {
+		return NewErrNoConflict("No conflicts detected 🎉")
+	}
+
 	FileLines = make(map[string][]string)
 	for i := range All {
 		if err = All[i].ExtractLines(); err != nil {
@@ -185,6 +190,5 @@ func Find() (err error) {
 		}
 	}
 
-	Count = len(All)
 	return nil
 }