From 0813934bb51ca449b86db858b59dc97fe69aa719 Mon Sep 17 00:00:00 2001 From: Tushar Muralidharan Date: Fri, 13 Mar 2026 18:53:37 +1100 Subject: [PATCH] Change 'Keep file' shortcut from 'k' to 'r' in merge conflict menu 'k' conflicts with vim-style navigation for moving up in the menu. Changed to 'r' (retain) to avoid accidental selection. --- 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 8cc2ca5e2a6..33f7919b5e4 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -647,7 +647,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: 'r', // 'r' for retain; avoid 'k' which conflicts with navigation } deleteItem := &types.MenuItem{ Label: self.c.Tr.MergeConflictDeleteFile,