Change keybinding of "keep" item in Merge Conflict menu back to 'k' (#5132)

stefanhaller · web-flow · commit 262e7f4e7947 · 2025-12-22T09:51:26.000+01:00
Now that we can use 'k' as a menu item binding (this was fixed in #5131), use it for the "keep" entry in the merge menu. I don't think this will be a problem for people's muscle memory, given that this menu is not encountered every day; and it's simply the better keybinding. This reverts commit b32b552.
diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go
@@ -585,7 +585,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: 'p',
+		Key: 'k',
 	}
 	deleteItem := &types.MenuItem{
 		Label: self.c.Tr.MergeConflictDeleteFile,

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ func (self FilesController) handleNonInlineConflict(file models.File) error {`
`585`	`585`	`OnPress: func() error {`
`586`	`586`	`return handle(self.c.Git().WorkingTree.StageFile, self.c.Tr.Actions.ResolveConflictByKeepingFile)`
`587`	`587`	`},`
`588`		`- Key: 'p',`
	`588`	`+ Key: 'k',`
`589`	`589`	`}`
`590`	`590`	`deleteItem := &types.MenuItem{`
`591`	`591`	`Label: self.c.Tr.MergeConflictDeleteFile,`