diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-29 11:49:37 +1100 |
|---|---|---|
| committer | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-03-29 02:36:01 +0000 |
| commit | 40b173118ac1ba3b42c01696521baf87af6f75e4 (patch) | |
| tree | 51339a58ba52e69c4b643def9926bf1791955fad /pkg | |
| parent | 8822c409e24bc143d0fe68834cabcc80fadaf48d (diff) | |
fix conflict race condition
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/gui/merge_panel.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index ba222a493..877d4fa9d 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -223,8 +223,10 @@ func (gui *Gui) refreshMergePanel() error { mainView := gui.getMainView() mainView.Wrap = false - gui.setViewContent(gui.g, mainView, content) - gui.Log.Warn("scrolling to conflict") + if err := gui.newStringTask("main", content); err != nil { + return err + } + if err := gui.scrollToConflict(gui.g); err != nil { return err } |