rename merging context to mergeConflicts

pkg/gui/controllers/files_controller.go

@@ -161,7 +161,7 @@ func (self *FilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []*
 			FocusedView: self.context().GetViewName(),
 		},
 		{
-			ViewName:    "merging",
+			ViewName:    "mergeConflicts",
 			Key:         gocui.MouseLeft,
 			Handler:     self.onClickMain,
 			FocusedView: self.context().GetViewName(),
@@ -269,7 +269,7 @@ func (self *FilesController) pressWithLock(node *filetree.FileNode) error {
 		file := node.File
 
 		if file.HasInlineMergeConflicts {
-			return self.c.PushContext(self.contexts.Merging)
+			return self.c.PushContext(self.contexts.MergeConflicts)
 		}
 
 		if file.HasUnstagedChanges {

pkg/gui/controllers/helpers/merge_and_rebase_helper.go

@@ -14,26 +14,23 @@ import (
 )
 
 type MergeAndRebaseHelper struct {
-	c                              *types.HelperCommon
-	contexts                       *context.ContextTree
-	git                            *commands.GitCommand
-	takeOverMergeConflictScrolling func()
-	refsHelper                     *RefsHelper
+	c          *types.HelperCommon
+	contexts   *context.ContextTree
+	git        *commands.GitCommand
+	refsHelper *RefsHelper
 }
 
 func NewMergeAndRebaseHelper(
 	c *types.HelperCommon,
 	contexts *context.ContextTree,
 	git *commands.GitCommand,
-	takeOverMergeConflictScrolling func(),
 	refsHelper *RefsHelper,
 ) *MergeAndRebaseHelper {
 	return &MergeAndRebaseHelper{
-		c:                              c,
-		contexts:                       contexts,
-		git:                            git,
-		takeOverMergeConflictScrolling: takeOverMergeConflictScrolling,
-		refsHelper:                     refsHelper,
+		c:          c,
+		contexts:   contexts,
+		git:        git,
+		refsHelper: refsHelper,
 	}
 }
 
@@ -189,7 +186,7 @@ func (self *MergeAndRebaseHelper) workingTreeStateNoun() string {
 
 // PromptToContinueRebase asks the user if they want to continue the rebase/merge that's in progress
 func (self *MergeAndRebaseHelper) PromptToContinueRebase() error {
-	self.takeOverMergeConflictScrolling()
+	self.contexts.MergeConflicts.SetUserScrolling(false)
 
 	return self.c.Confirm(types.ConfirmOpts{
 		Title:  "continue",

pkg/gui/controllers/merge_conflicts_controller.go

@@ -0,0 +1,54 @@
+package controllers
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/gui/context"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+)
+
+type MergeConflictsController struct {
+	baseController
+	*controllerCommon
+}
+
+var _ types.IController = &MergeConflictsController{}
+
+func NewMergeConflictsController(
+	common *controllerCommon,
+) *MergeConflictsController {
+	return &MergeConflictsController{
+		baseController:   baseController{},
+		controllerCommon: common,
+	}
+}
+
+func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
+	bindings := []*types.Binding{
+		{
+			Key:         opts.GetKey(opts.Config.Universal.Edit),
+			Handler:     self.EditFile,
+			Description: self.c.Tr.LcEditFile,
+		},
+	}
+
+	return bindings
+}
+
+func (self *MergeConflictsController) Context() types.Context {
+	return self.context()
+}
+
+func (self *MergeConflictsController) context() *context.MergeConflictsContext {
+	return self.contexts.MergeConflicts
+}
+
+func (self *MergeConflictsController) EditFile() error {
+	lineNumber := self.context().State().GetSelectedLine()
+	return self.helpers.Files.EditFileAtLine(self.context().State().GetPath(), lineNumber)
+}
+
+func (self *MergeConflictsController) withMergeConflictLock(f func() error) error {
+	self.context().State().Lock()
+	defer self.context().State().Unlock()
+
+	return f()
+}