go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-19 22:33:16 +02:00
Code Issues Releases Activity

refreshing files if there's an error while pulling because chances are it's a merge conflict

Browse Source
This commit is contained in:
Jesse Duffield 2018-07-21 15:57:23 +10:00
parent 087cc7362a
commit e059a87ae2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files_panel.go
View File

@ -250,10 +250,10 @@ func pullFiles(g *gocui.Gui, v *gocui.View) error {
} else { } else {
closeConfirmationPrompt(g) closeConfirmationPrompt(g)
refreshCommits(g) refreshCommits(g)
refreshFiles(g)
refreshStatus(g) refreshStatus(g)
devLog("pulled.") devLog("pulled.")
} }
refreshFiles(g)
}() }()
return nil return nil
} }