From 6043eb52db18de0103915ed4c9149f63777de98f Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 21 Dec 2025 12:22:51 +0100 Subject: [PATCH] Revert "Update resolve conflict using p instead of k" 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 b32b55201e0b392c777846de75eae3a2183aada6. --- pkg/gui/controllers/files_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index c9747562df4..9efe2f8f622 100644 --- 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,