Stefan Haller afe4d14106 Resolve submodule conflicts through a picker ... When both sides of a merge moved a submodule's gitlink, git reports it as "UU". Pressing space used to fall into the submodule no-op guard and pop the confusing "Nothing to stage..." error, and enter just entered the submodule, which does nothing to resolve the superproject conflict. Treat a conflicted submodule like the other non-textual conflicts: both space and enter now open a picker offering the two candidate commits, "current" and "incoming", each labelled with its summary. `git checkout --ours/--theirs` is a no-op on gitlinks, so we resolve by checking the submodule out at the chosen commit and staging it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>		2026-06-28 16:12:36 +02:00
..
add.go	Add a root item ("/") if files at top level have changed	2025-03-21 08:04:58 +01:00
enter.go	Convert custom command Key fields to Keybinding	2026-05-25 15:32:47 +02:00
enter_nested.go	Remove conditional code related to git earlier than 2.22	2025-04-09 10:40:52 +02:00
remove.go	Add integration test	2025-04-07 09:42:19 +02:00
remove_nested.go	Make file sort order and case sensitivity configurable	2026-03-30 17:53:25 +02:00
reset.go	Convert custom command Key fields to Keybinding	2026-05-25 15:32:47 +02:00
reset_folder.go	Update disabled message	2025-04-07 09:42:19 +02:00
resolve_conflict.go	Resolve submodule conflicts through a picker	2026-06-28 16:12:36 +02:00
shared.go	Show all submodules recursively	2024-03-07 20:16:28 +01:00
stage.go	Also verify stage-all can unstage a dirty submodule	2026-06-04 09:12:09 +02:00
stage_all_with_dirty_submodule.go	Explain when a submodule has nothing stageable	2026-06-04 09:12:09 +02:00
stage_dirty_only.go	Explain when a submodule has nothing stageable	2026-06-04 09:12:09 +02:00