From 99035959a110bd1b7f5e030d02ddf71384aad812 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 16 Jan 2022 23:09:01 +1100
Subject: [PATCH] fix merge scroll bug

---
 pkg/gui/merge_panel.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go
index 942340286..8abd55131 100644
--- a/pkg/gui/merge_panel.go
+++ b/pkg/gui/merge_panel.go
@@ -182,7 +182,12 @@ func (gui *Gui) renderConflicts(state *mergeconflicts.State, hasFocus bool) (boo
 	content := mergeconflicts.ColoredConflictFile(cat, state, hasFocus)
 
 	if !gui.State.Panels.Merging.UserVerticalScrolling {
-		gui.centerYPos(gui.Views.Main, state.GetConflictMiddle())
+		// TODO: find a way to not have to do this OnUIThread thing. Why doesn't it work
+		// without it given that we're calling the 'no scroll' variant below?
+		gui.OnUIThread(func() error {
+			gui.centerYPos(gui.Views.Main, state.GetConflictMiddle())
+			return nil
+		})
 	}
 
 	return true, gui.refreshMainViews(refreshMainOpts{