Enable swtiching between multiple conflicts

mkchoi212 · Dec 28, 2017 · 162b566 · 162b566
1 parent da7adc8
commit 162b566
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -41,7 +41,6 @@ func layout(g *gocui.Gui) error {
 		v.Title = "Conflicts"
 	}
 
-	selectConflict(0, g)
 	return nil
 }
 
@@ -111,7 +110,6 @@ func nextConflict(g *gocui.Gui, v *gocui.View) error {
 }
 
 func resolveConflict(g *gocui.Gui, v *gocui.View) error {
-
 	g.Update(func(g *gocui.Gui) error {
 		conflicts[current].Resolve()
 		selectConflict(current, g)
@@ -160,6 +158,11 @@ func main() {
 		log.Panicln(err)
 	}
 
+	g.Update(func(g *gocui.Gui) error {
+		selectConflict(0, g)
+		return nil
+	})
+
 	if err := g.MainLoop(); err != nil && err != gocui.ErrQuit {
 		log.Panicln(err)
 	}