fixup! Add merge options menu

stefanhaller · stefanhaller · commit 028107bd626f · 2025-10-08T13:58:05.000+02:00
diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go
@@ -335,7 +335,8 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin
 		}
 
 		err := self.c.Git().WorkingTree.StageFiles(selectedFilepaths, nil)
-		return self.mergeAndRebaseHelper.CheckMergeOrRebase(err)
+		self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}})
+		return err
 	}
 
 	cmdColor := style.FgBlue

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,8 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`err := self.c.Git().WorkingTree.StageFiles(selectedFilepaths, nil)`
`338`		`- return self.mergeAndRebaseHelper.CheckMergeOrRebase(err)`
	`338`	`+ self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}})`
	`339`	`+ return err`
`339`	`340`	`}`
`340`	`341`
`341`	`342`	`cmdColor := style.FgBlue`