From e059a87ae2c3bb4abce9c261db04971915520479 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 21 Jul 2018 15:57:23 +1000
Subject: [PATCH] refreshing files if there's an error while pulling because
 chances are it's a merge conflict

---
 files_panel.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files_panel.go b/files_panel.go
index 0c8b5ec3d..b4d5b8414 100644
--- a/files_panel.go
+++ b/files_panel.go
@@ -250,10 +250,10 @@ func pullFiles(g *gocui.Gui, v *gocui.View) error {
 		} else {
 			closeConfirmationPrompt(g)
 			refreshCommits(g)
-			refreshFiles(g)
 			refreshStatus(g)
 			devLog("pulled.")
 		}
+		refreshFiles(g)
 	}()
 	return nil
 }