From b32b55201e0b392c777846de75eae3a2183aada6 Mon Sep 17 00:00:00 2001 From: Marco Zingoni Date: Sat, 4 Oct 2025 09:51:55 +0200 Subject: [PATCH] Update resolve conflict using p instead of k --- 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 69b4865ef..bf71bf04a 100644 --- 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,