Fix predicate for checking conflict existence

mkchoi212 · May 22, 2018 · f0822c9 · f0822c9
1 parent 7d9024a
commit f0822c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/layout.go b/layout.go
@@ -39,6 +39,7 @@ func layout(g *gocui.Gui) (err error) {
 	if err = makePrompt(g); err != nil {
 		return
 	}
+
 	return
 }
 

diff --git a/main.go b/main.go
@@ -74,6 +74,7 @@ func Start() (err error) {
 	}
 
 	Select(conflicts[cur], g, false)
+
 	if err = g.MainLoop(); err != nil {
 		return
 	}
@@ -89,10 +90,6 @@ func main() {
 		fmt.Println(color.Red(color.Regular, err.Error()))
 		return
 	}
-	if len(files) == 0 {
-		fmt.Println(color.Green(color.Regular, "No conflicts detected 🎉"))
-		return
-	}
 
 	for i := range files {
 		file := &files[i]
@@ -101,6 +98,11 @@ func main() {
 		}
 	}
 
+	if len(conflicts) == 0 {
+		fmt.Println(color.Green(color.Regular, "No conflicts detected 🎉"))
+		return
+	}
+
 	// Main GUI loop
 	for {
 		if err := Start(); err != nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ func layout(g *gocui.Gui) (err error) { @@
     	if err = makePrompt(g); err != nil {
     		return
     	}
     	return
     }
@@ Expand Down @@