Update resolve conflict using p instead of k

zingazzi · stefanhaller · commit b32b55201e0b · 2025-10-05T10:23:03.000+02:00
diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go
@@ -573,7 +573,7 @@ func (self *FilesController) handleNonInlineConflict(file *models.File) error {
 		OnPress: func() error {
 			return handle(self.c.Git().WorkingTree.StageFile, self.c.Tr.Actions.ResolveConflictByKeepingFile)
 		},
-		Key: 'k',
+		Key: 'p',
 	}
 	deleteItem := &types.MenuItem{
 		Label: self.c.Tr.MergeConflictDeleteFile,

Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ func (self FilesController) handleNonInlineConflict(file models.File) error {`
`573`	`573`	`OnPress: func() error {`
`574`	`574`	`return handle(self.c.Git().WorkingTree.StageFile, self.c.Tr.Actions.ResolveConflictByKeepingFile)`
`575`	`575`	`},`
`576`		`- Key: 'k',`
	`576`	`+ Key: 'p',`
`577`	`577`	`}`
`578`	`578`	`deleteItem := &types.MenuItem{`
`579`	`579`	`Label: self.c.Tr.MergeConflictDeleteFile,`