go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-26 05:37:18 +02:00
Code Issues Releases Activity

fix conflict race condition

Browse Source
This commit is contained in:
Jesse Duffield 2020-03-29 11:49:37 +11:00 committed by github-actions[bot]
parent 8822c409e2
commit 40b173118a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/gui/merge_panel.go
View File

@ -223,8 +223,10 @@ func (gui *Gui) refreshMergePanel() error {
mainView := gui.getMainView() mainView := gui.getMainView()
mainView.Wrap = false mainView.Wrap = false
gui.setViewContent(gui.g, mainView, content) if err := gui.newStringTask("main", content); err != nil {
gui.Log.Warn("scrolling to conflict") return err
}
if err := gui.scrollToConflict(gui.g); err != nil { if err := gui.scrollToConflict(gui.g); err != nil {
return err return err
} }