Handle no conflict error

conflict.go

@@ -29,6 +29,20 @@ type Conflict struct {
 	displayDiff bool
 }
 
+type ErrNoConflict struct {
+	message string
+}
+
+func NewErrNoConflict(message string) *ErrNoConflict {
+	return &ErrNoConflict{
+		message: message,
+	}
+}
+
+func (e *ErrNoConflict) Error() string {
+	return e.message
+}
+
 const (
 	Local    = 1
 	Incoming = 2

main.go

@@ -87,7 +87,13 @@ func main() {
 	var err error
 	conflicts, err = Find()
 	if err != nil {
-		log.Panicln("No conflicts found")
+		switch err.(type) {
+		case *ErrNoConflict:
+			fmt.Println(Green(Regular, err.Error()))
+			return
+		default:
+			log.Panicln(err)
+		}
 	}
 	conflictCount = len(conflicts)
 

parse.go

@@ -160,7 +160,7 @@ func Find() ([]Conflict, error) {
 
 	cmdOut, err = cmd.Output()
 	if !(strings.Contains(err.Error(), "exit status 2")) {
-		return nil, err
+		return nil, NewErrNoConflict("No conflicts detected 🎉")
 	}
 
 	output := bytes.Split(cmdOut, []byte("\n"))
@@ -178,17 +178,17 @@ func Find() ([]Conflict, error) {
 				conflicts = append(conflicts, c)
 			}
 		} else {
-			log.Panic(err)
+			return nil, err
 		}
 	}
 
 	allFileLines = make(map[string][]string)
 	for i := range conflicts {
 		if err := conflicts[i].ExtractLines(); err != nil {
-			log.Panicln(err)
+			return nil, err
 		}
 		if err := conflicts[i].Highlight(); err != nil {
-			log.Println(err)
+			return nil, err
 		}
 	}