Stefan HallerandClaude Opus 5.5 fabc14d7e5 Keep the conflicts popup open after moving a patch into a new commit ...

If moving a custom patch into a new commit stops at a conflict,
CheckMergeOrRebase shows the "Conflicts!" popup. The handler then
focused the commits view anyway, and this closed the popup.

Only focus the commits view if the operation finished.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

2026-11-03 19:25:48 +01:00

..

helpers

Don't offer to push or pull branches merged into a local main branch

2026-10-31 15:12:36 +01:00

attach.go

Copy the selected diff lines from the focused main view

2026-10-05 11:01:24 +02:00

base_controller.go

Copy the selected diff lines from the focused main view

2026-10-05 11:01:24 +02:00

basic_commits_controller.go

Avoid appending to an array literal

2026-08-16 16:35:11 +02:00

bisect_controller.go

Show the result of a finished bisect instead of the bisect menu

2026-10-31 11:27:58 +01:00

branches_controller.go

Lay out the rule below a pull request's header to the main view's width

2026-10-05 16:38:13 +02:00

command_log_controller.go

…

commit_description_controller.go

…

commit_diff_actions.go

Show an error if the commit to discard lines from can't be found

2026-10-10 13:04:41 +02:00

commit_message_controller.go

…

commits_files_controller.go

Copy the absolute path of a branch's file from the worktree that has it

2026-10-10 13:58:05 +02:00

common.go

…

confirmation_controller.go

…

context_lines_controller.go

Allow context changes while building a custom patch

2026-10-05 11:44:42 +02:00

custom_patch_options_menu_action.go

Keep the conflicts popup open after moving a patch into a new commit

2026-11-03 19:25:48 +01:00

diff_copy.go

Move the diff-copy helper out of the explorer controller

2026-10-05 11:44:42 +02:00

diff_paths_test.go

Collapse the paths of a moved directory into the directory itself

2026-08-17 09:32:30 +02:00

diff_paths.go

Show an error if the selected diff lines can't be found in the diff

2026-10-10 13:04:41 +02:00

diffing_menu_action.go

…

edit_config_action.go

…

files_controller.go

Ask before discarding a nested repository if that loses anything

2026-10-15 20:51:34 +02:00

filter_controller.go

Filter a menu by typing into it

2026-08-31 20:41:22 +02:00

filtering_menu_action.go

Handle entering and leaving filtering mode in one place

2026-08-05 17:29:20 +02:00

git_flow_controller.go

…

global_controller.go

Add a menu of the diff's files to jump to one directly

2026-10-05 12:14:02 +02:00

jump_to_side_window_controller.go

…

list_controller_trait.go

…

list_controller.go

Scroll the selection into view by default

2026-08-14 08:04:13 +02:00

local_commits_controller_test.go

…

local_commits_controller.go

Load all commits when the selection is near the end of the loaded ones

2026-10-31 11:27:58 +01:00

main_view_controller_test.go

Open the selected diff line in the branch's pull request

2026-10-05 12:05:39 +02:00

main_view_controller.go

Restore the terminal if a timer or errgroup function panics

2026-10-14 20:28:53 +02:00

menu_controller.go

Point the note about the menu's essential keys at what it means

2026-08-31 20:41:22 +02:00

menu_key.go

…

merge_conflicts_controller.go

…

options_menu_action.go

Build a custom patch from a commit's diff, and discard lines from it

2026-10-05 11:33:11 +02:00

patch_explorer_controller_test.go

…

prompt_controller.go

…

quit_actions.go

…

reflog_commits_controller.go

Build a custom patch from a commit's diff, and discard lines from it

2026-10-05 11:33:11 +02:00

remote_branches_controller.go

…

remotes_controller_test.go

…

remotes_controller.go

…

rename_similarity_threshold_controller.go

…

screen_mode_actions.go

Rework the custom pager config (rename to diff renderer)

2026-07-31 08:42:51 +02:00

scroll_off_margin_test.go

…

scroll_off_margin.go

…

search_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

search_prompt_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

shell_command_action.go

…

side_window_controller.go

…

snake_controller.go

…

stash_controller.go

Let the prefix of a render be laid out to the width it renders at

2026-10-05 16:38:13 +02:00

status_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

sub_commits_controller.go

Unify the code that loads all commits when scrolling near the end

2026-10-31 11:27:58 +01:00

submodules_controller.go

Let the prefix of a render be laid out to the width it renders at

2026-10-05 16:38:13 +02:00

suggestions_controller.go

Drop the highlight fixups the context stack now makes unnecessary

2026-09-03 21:19:04 +02:00

switch_to_diff_files_controller.go

Give the panels showing a commit's diff one voice about it

2026-10-05 11:33:11 +02:00

switch_to_focused_main_view_controller.go

Open file diffs in the focused main view

2026-10-05 11:44:42 +02:00

switch_to_sub_commits_controller.go

…

sync_controller.go

Offer to update the branches stacked below the current one when pulling

2026-09-27 11:13:15 +02:00

tags_controller.go

Let the prefix of a render be laid out to the width it renders at

2026-10-05 16:38:13 +02:00

toggle_whitespace_action.go

Remove the staging and patch-building panel shells

2026-10-05 11:44:42 +02:00

undo_controller.go

…

vertical_scroll_controller.go

…

working_tree_diff_actions.go

Show an error if the selected diff lines can't be found in the diff

2026-10-10 13:04:41 +02:00

workspace_reset_controller.go

…

worktrees_controller.go

Move the menu for removing a worktree to BranchesHelper

2026-10-15 20:51:34 +02:00