diff --git a/README.md b/README.md
index e224819..8be00a4 100644
--- a/README.md
+++ b/README.md
@@ -242,6 +242,7 @@ Available top-level config domains:
 - `windows`
 - `filetree`
 - `log`
+- `merge`
 - `keymaps`
 - `pane_navigation`
 - `hunk_navigation`
@@ -261,6 +262,7 @@ Notes:
 - `theme.preset` selects a built-in palette, and `theme.palette` can override individual colors on top of that preset.
 - `welcome.animate` controls whether the welcome screen animation runs.
 - `watch.enabled` keeps `.git` metadata watchers on. `watch.poll` controls background worktree polling for new untracked/external file changes.
+- `merge.keymaps.show_help` controls the merge actions help key. It defaults to `?`.
 - Discard actions always prompt for confirmation before changing the repo state.
 
 </details>
diff --git a/lua/glance/config.lua b/lua/glance/config.lua
index 960e2bb..15158a9 100644
--- a/lua/glance/config.lua
+++ b/lua/glance/config.lua
@@ -92,6 +92,7 @@ local ALLOWED_MERGE = {
 }
 
 local ALLOWED_MERGE_KEYMAPS = {
+  show_help = true,
   accept_ours = true,
   accept_theirs = true,
   accept_both_ours_then_theirs = true,
@@ -107,6 +108,7 @@ local ALLOWED_MERGE_KEYMAPS = {
 }
 
 local MERGE_KEYMAP_ORDER = {
+  'show_help',
   'accept_ours',
   'accept_theirs',
   'accept_both_ours_then_theirs',
@@ -260,6 +262,7 @@ local BASE_DEFAULTS = {
   },
   merge = {
     keymaps = {
+      show_help = '?',
       accept_ours = '<leader>o',
       accept_theirs = '<leader>t',
       accept_both_ours_then_theirs = '<leader>O',
diff --git a/lua/glance/merge/help.lua b/lua/glance/merge/help.lua
new file mode 100644
index 0000000..3517ab6
--- /dev/null
+++ b/lua/glance/merge/help.lua
@@ -0,0 +1,363 @@
+local actions = require('glance.merge.actions')
+local config = require('glance.config')
+
+local M = {}
+local AUGROUP = vim.api.nvim_create_augroup('GlanceMergeHelp', { clear = true })
+
+local state = {
+  buf = nil,
+  win = nil,
+  return_win = nil,
+}
+
+local ACTION_LABELS = {
+  accept_ours = 'accept ours',
+  accept_theirs = 'accept theirs',
+  accept_both_ours_then_theirs = 'accept both (ours -> theirs)',
+  accept_both_theirs_then_ours = 'accept both (theirs -> ours)',
+  keep_base = 'keep base',
+  reset_conflict = 'reset conflict',
+  mark_resolved = 'mark resolved',
+  accept_all_ours = 'accept all ours',
+  accept_all_theirs = 'accept all theirs',
+  reset_result = 'reset result',
+  complete_merge = 'complete file',
+  continue_operation = 'continue operation',
+}
+
+local function display_key(lhs)
+  if type(lhs) ~= 'string' then
+    return ''
+  end
+  return lhs:gsub('<Leader>', '\\'):gsub('<leader>', '\\')
+end
+
+local function help_key()
+  return display_key(config.options.merge.keymaps.show_help)
+end
+
+local function buffer_valid()
+  return state.buf and vim.api.nvim_buf_is_valid(state.buf)
+end
+
+local function window_valid()
+  return state.win and vim.api.nvim_win_is_valid(state.win)
+end
+
+local function close_window()
+  local return_win = state.return_win
+  local win = state.win
+  local buf = state.buf
+
+  pcall(vim.api.nvim_clear_autocmds, { group = AUGROUP })
+  state.buf = nil
+  state.win = nil
+  state.return_win = nil
+
+  if win and vim.api.nvim_win_is_valid(win) then
+    pcall(vim.api.nvim_win_close, win, true)
+  end
+  if buf and vim.api.nvim_buf_is_valid(buf) then
+    pcall(vim.api.nvim_buf_delete, buf, { force = true })
+  end
+  if return_win and vim.api.nvim_win_is_valid(return_win) then
+    pcall(vim.api.nvim_set_current_win, return_win)
+  end
+end
+
+local function float_config(line_count)
+  local width = math.min(78, math.max(vim.o.columns - 8, 38))
+  local editor_height = math.max(vim.o.lines - vim.o.cmdheight, 8)
+  local height = math.min(math.max(line_count, 8), math.max(editor_height - 6, 6))
+
+  return {
+    relative = 'editor',
+    row = math.max(0, math.floor((editor_height - height) / 2)),
+    col = math.max(0, math.floor((vim.o.columns - width) / 2)),
+    width = width,
+    height = height,
+    style = 'minimal',
+    border = 'rounded',
+    title = ' Merge Actions ',
+    title_pos = 'center',
+    zindex = math.max((config.options.minimap.zindex or 50) + 10, 60),
+  }
+end
+
+local function apply_window_options(win)
+  vim.api.nvim_win_set_option(win, 'wrap', false)
+  vim.api.nvim_win_set_option(win, 'cursorline', false)
+  vim.api.nvim_win_set_option(win, 'number', false)
+  vim.api.nvim_win_set_option(win, 'relativenumber', false)
+  vim.api.nvim_win_set_option(win, 'signcolumn', 'no')
+  vim.api.nvim_win_set_option(win, 'winhighlight', 'FloatTitle:GlanceLegendKey')
+end
+
+local function setup_buffer(lines)
+  state.buf = vim.api.nvim_create_buf(false, true)
+  vim.api.nvim_buf_set_name(state.buf, 'glance://merge/actions')
+  vim.api.nvim_buf_set_option(state.buf, 'buftype', 'nofile')
+  vim.api.nvim_buf_set_option(state.buf, 'bufhidden', 'wipe')
+  vim.api.nvim_buf_set_option(state.buf, 'swapfile', false)
+  vim.api.nvim_buf_set_option(state.buf, 'filetype', 'glance')
+  vim.api.nvim_buf_set_option(state.buf, 'modifiable', true)
+  vim.api.nvim_buf_set_lines(state.buf, 0, -1, false, lines)
+  vim.api.nvim_buf_set_option(state.buf, 'modifiable', false)
+  vim.api.nvim_buf_set_option(state.buf, 'readonly', true)
+end
+
+local function bind_close_keys()
+  local opts = { noremap = true, silent = true, buffer = state.buf }
+  vim.keymap.set('n', 'q', close_window, opts)
+  vim.keymap.set('n', '<Esc>', close_window, opts)
+
+  local lhs = config.options.merge.keymaps.show_help
+  if type(lhs) == 'string' and lhs ~= '' then
+    vim.keymap.set('n', lhs, close_window, opts)
+  end
+end
+
+local function setup_autocmds()
+  vim.api.nvim_create_autocmd('WinClosed', {
+    group = AUGROUP,
+    pattern = tostring(state.win),
+    once = true,
+    callback = function()
+      vim.schedule(function()
+        if window_valid() then
+          return
+        end
+        if buffer_valid() then
+          pcall(vim.api.nvim_buf_delete, state.buf, { force = true })
+        end
+        state.buf = nil
+        state.win = nil
+        state.return_win = nil
+      end)
+    end,
+  })
+
+  vim.api.nvim_create_autocmd('VimResized', {
+    group = AUGROUP,
+    callback = function()
+      if window_valid() and buffer_valid() then
+        local line_count = vim.api.nvim_buf_line_count(state.buf)
+        pcall(vim.api.nvim_win_set_config, state.win, float_config(line_count))
+      end
+    end,
+  })
+end
+
+local function key_line(action, detail)
+  local key = display_key(config.options.merge.keymaps[action])
+  local label = ACTION_LABELS[action] or action:gsub('_', ' ')
+  if key ~= '' then
+    label = '[' .. key .. '] ' .. label
+  else
+    label = '[-] ' .. label
+  end
+  if detail and detail ~= '' then
+    label = label .. ' - ' .. detail
+  end
+  return '  ' .. label
+end
+
+local function custom_key_line(action, label, detail)
+  local key = display_key(config.options.merge.keymaps[action])
+  if key ~= '' then
+    label = '[' .. key .. '] ' .. label
+  else
+    label = '[-] ' .. label
+  end
+  if detail and detail ~= '' then
+    label = label .. ' - ' .. detail
+  end
+  return '  ' .. label
+end
+
+local function section(lines, title)
+  if #lines > 0 then
+    lines[#lines + 1] = ''
+  end
+  lines[#lines + 1] = title
+end
+
+local function operation_label(context)
+  local labels = {
+    merge = 'merge',
+    rebase = 'rebase',
+    cherry_pick = 'cherry-pick',
+    revert = 'revert',
+  }
+  return labels[context and context.kind] or 'operation'
+end
+
+local function add_text_conflict_actions(lines, conflict)
+  section(lines, 'Current conflict')
+  if not conflict then
+    lines[#lines + 1] = '  No active conflict. Use ]x and [x to move between conflicts.'
+    return
+  end
+
+  for _, definition in ipairs(actions.available(conflict)) do
+    lines[#lines + 1] = key_line(definition.id)
+  end
+end
+
+local function add_text_file_actions(lines, model)
+  section(lines, 'File')
+  lines[#lines + 1] = key_line('accept_all_ours', 'apply to default unresolved conflicts')
+  lines[#lines + 1] = key_line('accept_all_theirs', 'apply to default unresolved conflicts')
+  lines[#lines + 1] = key_line('reset_result', 'rebuild from Git stages')
+
+  local unresolved = model and model.unresolved_count or 0
+  if unresolved > 0 then
+    lines[#lines + 1] = key_line('complete_merge', string.format('blocked: %d unresolved', unresolved))
+  else
+    lines[#lines + 1] = key_line('complete_merge', 'stage this resolved file')
+  end
+end
+
+local function side_entry(info, side)
+  local stage = side == 'ours' and 2 or 3
+  return info and info.stage_entries and info.stage_entries[stage] or nil
+end
+
+local function special_side_label(info, side)
+  local label = side == 'ours' and 'Ours' or 'Theirs'
+  local entry = side_entry(info, side)
+  if not entry then
+    return 'accept ' .. label .. ' deletion'
+  end
+  if info.class == 'modify_delete' then
+    return 'keep ' .. label .. ' modified version'
+  end
+  if info.class == 'rename_delete' then
+    return 'keep ' .. label .. ' renamed path'
+  end
+  if info.class == 'rename_rename' then
+    return 'keep ' .. label .. ' path'
+  end
+  return 'take ' .. label
+end
+
+local function add_special_conflict_actions(lines, info)
+  section(lines, 'Current conflict')
+  lines[#lines + 1] = custom_key_line('accept_ours', special_side_label(info, 'ours'))
+  lines[#lines + 1] = custom_key_line('accept_theirs', special_side_label(info, 'theirs'))
+
+  if info and (info.class == 'rename_rename' or info.class == 'non_text_add_add') then
+    lines[#lines + 1] = '  Keep both requires choosing another output path manually.'
+  end
+end
+
+local function add_special_file_actions(lines, selection)
+  section(lines, 'File')
+  if selection then
+    lines[#lines + 1] = key_line('complete_merge', 'stage the selected resolution')
+  else
+    lines[#lines + 1] = key_line('complete_merge', 'blocked: choose ours or theirs first')
+  end
+end
+
+local function add_operation_actions(lines, context)
+  section(lines, 'Operation')
+  if not context or not context.kind then
+    lines[#lines + 1] = '  No active Git operation was detected.'
+    return
+  end
+
+  if context.kind == 'merge' then
+    lines[#lines + 1] = '  After all conflicted files are complete, press [c] in the filetree to commit the merge.'
+    return
+  end
+
+  lines[#lines + 1] = key_line(
+    'continue_operation',
+    'available after all conflicted files are complete'
+  ):gsub('continue operation', 'continue ' .. operation_label(context), 1)
+end
+
+local function text_lines(opts)
+  local model = opts.model or {}
+  local conflict = opts.active_conflict_index and model.conflicts and model.conflicts[opts.active_conflict_index] or nil
+  local lines = {
+    'Merge actions for the current conflict file.',
+  }
+
+  add_text_conflict_actions(lines, conflict)
+  add_text_file_actions(lines, model)
+  add_operation_actions(lines, opts.context or model.operation)
+  return lines
+end
+
+local function special_lines(opts)
+  local lines = {
+    'Merge actions for this special conflict.',
+  }
+
+  add_special_conflict_actions(lines, opts.info)
+  add_special_file_actions(lines, opts.selection)
+  add_operation_actions(lines, opts.context)
+  return lines
+end
+
+function M.winbar_hint()
+  local key = help_key()
+  if key == '' then
+    return ''
+  end
+  return '%#GlanceAccentText#' .. key .. ' actions%*'
+end
+
+function M.complete_hint()
+  local key = display_key(config.options.merge.keymaps.complete_merge)
+  if key == '' then
+    return ''
+  end
+  return key .. ' complete'
+end
+
+function M.open(opts)
+  opts = opts or {}
+  if window_valid() then
+    vim.api.nvim_set_current_win(state.win)
+    return true
+  end
+
+  close_window()
+  state.return_win = vim.api.nvim_get_current_win()
+
+  local lines
+  if opts.kind == 'special' then
+    lines = special_lines(opts)
+  else
+    lines = text_lines(opts)
+  end
+
+  setup_buffer(lines)
+  state.win = vim.api.nvim_open_win(state.buf, true, float_config(#lines))
+  apply_window_options(state.win)
+  bind_close_keys()
+  setup_autocmds()
+  return true
+end
+
+function M.toggle(opts)
+  if window_valid() then
+    close_window()
+    return false
+  end
+  M.open(opts)
+  return true
+end
+
+function M.close()
+  close_window()
+end
+
+function M.is_open()
+  return window_valid()
+end
+
+return M
diff --git a/lua/glance/merge/init.lua b/lua/glance/merge/init.lua
index a6e9dd6..d6a226b 100644
--- a/lua/glance/merge/init.lua
+++ b/lua/glance/merge/init.lua
@@ -2,6 +2,7 @@ local actions = require('glance.merge.actions')
 local config = require('glance.config')
 local filetree = require('glance.filetree')
 local git = require('glance.git')
+local help = require('glance.merge.help')
 local layout = require('glance.merge.layout')
 local model = require('glance.merge.model')
 local render = require('glance.merge.render')
@@ -474,6 +475,15 @@ local function write_result_if_modified(diffview)
 end
 
 local function handle_action_keymap(diffview, action)
+  if action == 'show_help' then
+    help.toggle({
+      kind = 'text',
+      model = state.model,
+      active_conflict_index = state.active_conflict_index,
+      context = state.model and state.model.operation or git.get_operation_context(),
+    })
+    return
+  end
   if action == 'accept_all_ours' then
     apply_all(diffview, 'accept_ours')
     return
@@ -847,6 +857,7 @@ function M.reset()
   state.active_conflict_index = nil
   state.write_in_progress = false
   state.sync_in_progress = false
+  help.close()
   special.reset()
 end
 
diff --git a/lua/glance/merge/render.lua b/lua/glance/merge/render.lua
index 9d078a9..2ef3011 100644
--- a/lua/glance/merge/render.lua
+++ b/lua/glance/merge/render.lua
@@ -1,5 +1,5 @@
-local actions = require('glance.merge.actions')
 local config = require('glance.config')
+local help = require('glance.merge.help')
 local layout = require('glance.merge.layout')
 
 local M = {}
@@ -120,10 +120,21 @@ local function result_label(model, active_conflict_index)
     parts[#parts + 1] = 'inference fallback'
   end
 
+  local hints = {}
+  if model.unresolved_count == 0 then
+    local complete_hint = help.complete_hint()
+    if complete_hint ~= '' then
+      hints[#hints + 1] = complete_hint
+    end
+  end
+  local help_hint = help.winbar_hint()
+  if help_hint ~= '' then
+    hints[#hints + 1] = help_hint
+  end
+
   local label = table.concat(parts, ' | ')
-  local hint = conflict and actions.hint_text(conflict, config.options.merge.keymaps) or ''
-  if hint ~= '' then
-    return label .. '%=' .. hint .. action_bar_padding()
+  if #hints > 0 then
+    return label .. '%=' .. table.concat(hints, ' | ') .. action_bar_padding()
   end
   return label
 end
diff --git a/lua/glance/merge/special.lua b/lua/glance/merge/special.lua
index 91fde52..e475f75 100644
--- a/lua/glance/merge/special.lua
+++ b/lua/glance/merge/special.lua
@@ -1,6 +1,7 @@
 local config = require('glance.config')
 local filetree = require('glance.filetree')
 local git = require('glance.git')
+local help = require('glance.merge.help')
 local layout = require('glance.merge.layout')
 local workspace = require('glance.workspace')
 
@@ -247,7 +248,12 @@ local function render(diffview)
     end
     parts[#parts + 1] = class_title(state.info.class)
     parts[#parts + 1] = selection_label(state.info, state.selection)
-    vim.api.nvim_set_option_value('winbar', table.concat(parts, ' | '), { win = win })
+    local label = table.concat(parts, ' | ')
+    local hint = help.winbar_hint()
+    if hint ~= '' then
+      label = label .. '%=' .. hint
+    end
+    vim.api.nvim_set_option_value('winbar', label, { win = win })
   end
 end
 
@@ -278,6 +284,16 @@ local function bind_keymaps(diffview)
       M.complete(diffview)
     end, opts)
   end
+  if km.show_help then
+    vim.keymap.set('n', km.show_help, function()
+      help.toggle({
+        kind = 'special',
+        info = state.info,
+        selection = state.selection,
+        context = git.get_operation_context(),
+      })
+    end, opts)
+  end
   if km.continue_operation then
     vim.keymap.set('n', km.continue_operation, function()
       filetree.continue_operation()
diff --git a/tests/integration/diffview_spec.lua b/tests/integration/diffview_spec.lua
index e5e748c..ce2b7cd 100644
--- a/tests/integration/diffview_spec.lua
+++ b/tests/integration/diffview_spec.lua
@@ -604,7 +604,7 @@ return {
       end,
     },
     {
-      name = 'merge action bar renders configured keys and accept ours resolves immediately',
+      name = 'merge result winbar points to dynamic action help and accept ours resolves immediately',
       run = function()
         N.with_repo('repo_conflict', function(repo)
           require('glance').start()
@@ -624,11 +624,20 @@ return {
           A.truthy(has_extmark_detail(marks, 'number_hl_group', 'GlanceConflictActiveNumber'))
           A.contains(winbar, '1/1')
           A.contains(winbar, 'unresolved')
-          A.contains(winbar, '\\o ours')
-          A.contains(winbar, '\\t theirs')
-          A.contains(winbar, '\\O both o/t')
-          A.contains(winbar, '\\T both t/o')
-          A.contains(winbar, '\\b base')
+          A.contains(winbar, '? actions')
+          A.falsy(winbar:find('\\o ours', 1, true))
+
+          N.press('?')
+          local help_buf = vim.api.nvim_get_current_buf()
+          local help_lines = table.concat(vim.api.nvim_buf_get_lines(help_buf, 0, -1, false), '\n')
+          A.contains(vim.api.nvim_buf_get_name(help_buf), 'glance://merge/actions')
+          A.contains(help_lines, 'Current conflict')
+          A.contains(help_lines, '[\\o] accept ours')
+          A.contains(help_lines, '[\\ao] accept all ours')
+          A.contains(help_lines, '[\\c] complete file - blocked: 1 unresolved')
+
+          N.press('?')
+          A.equal(vim.api.nvim_get_current_win(), result_win)
 
           N.press('\\o')
 
@@ -636,6 +645,8 @@ return {
           winbar = vim.api.nvim_get_option_value('winbar', { win = result_win })
           A.contains(winbar, 'handled: ours')
           A.contains(winbar, '0 unresolved')
+          A.contains(winbar, '\\c complete')
+          A.contains(winbar, '? actions')
 
           vim.api.nvim_buf_call(result_buf, function()
             vim.cmd('write')
@@ -861,6 +872,20 @@ return {
           A.equal(vim.api.nvim_get_option_value('readonly', { buf = panel_buf }), true)
           A.contains(table.concat(vim.api.nvim_buf_get_lines(panel_buf, 0, -1, false), '\n'), 'Binary Conflict')
           A.contains(vim.api.nvim_get_option_value('winbar', { win = panel_win }), 'no choice selected')
+          A.contains(vim.api.nvim_get_option_value('winbar', { win = panel_win }), '? actions')
+
+          N.press('?')
+          local help_buf = vim.api.nvim_get_current_buf()
+          local help_lines = table.concat(vim.api.nvim_buf_get_lines(help_buf, 0, -1, false), '\n')
+          A.contains(vim.api.nvim_buf_get_name(help_buf), 'glance://merge/actions')
+          A.contains(help_lines, 'Merge actions for this special conflict.')
+          A.contains(help_lines, 'Current conflict')
+          A.contains(help_lines, '[\\o] take Ours')
+          A.contains(help_lines, '[\\t] take Theirs')
+          A.contains(help_lines, '[\\c] complete file - blocked: choose ours or theirs first')
+
+          N.press('?')
+          A.equal(vim.api.nvim_get_current_win(), panel_win)
 
           N.press('\\c')
 
diff --git a/tests/unit/config_spec.lua b/tests/unit/config_spec.lua
index 08d8daa..42d5cf0 100644
--- a/tests/unit/config_spec.lua
+++ b/tests/unit/config_spec.lua
@@ -79,6 +79,7 @@ return {
           },
           merge = {
             keymaps = {
+              show_help = '?',
               accept_ours = '<leader>o',
               accept_theirs = '<leader>t',
               accept_both_ours_then_theirs = '<leader>O',
@@ -163,6 +164,7 @@ return {
           },
           merge = {
             keymaps = {
+              show_help = 'g?',
               accept_ours = 'go',
             },
           },
@@ -195,6 +197,7 @@ return {
         A.equal(config.options.windows.filetree.cursorline, true)
         A.equal(config.options.filetree.show_legend, false)
         A.equal(config.options.log.max_commits, 75)
+        A.equal(config.options.merge.keymaps.show_help, 'g?')
         A.equal(config.options.merge.keymaps.accept_ours, 'go')
         A.equal(config.options.merge.keymaps.accept_theirs, '<leader>t')
         A.equal(config.options.merge.keymaps.accept_all_ours, '<leader>ao')