split context common from helper common

2025-11-29 22:48:24 +02:00 · 2023-03-23 12:35:07 +11:00
parent f081358943
commit 43251e7275
55 changed files with 156 additions and 133 deletions
--- a/pkg/gui/controllers/helpers/merge_conflicts_helper.go
+++ b/pkg/gui/controllers/helpers/merge_conflicts_helper.go
@@ -7,13 +7,13 @@ import (
 )

 type MergeConflictsHelper struct {
-	c        *types.HelperCommon
+	c        *HelperCommon
 	contexts *context.ContextTree
 	git      *commands.GitCommand
 }

 func NewMergeConflictsHelper(
-	c *types.HelperCommon,
+	c *HelperCommon,
 	contexts *context.ContextTree,
 	git *commands.GitCommand,
 ) *MergeConflictsHelper {