mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-20 05:19:24 +02:00
refreshing files if there's an error while pulling because chances are it's a merge conflict
This commit is contained in:
parent
087cc7362a
commit
e059a87ae2
@ -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
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user