mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-11 16:16:28 -04:00
39513d244d
When there is a single conflicting file left to be resolved, lazygit dismisses the conflicted-files-only filter when the file no longer has conflict markers. However, the selection moved to the top, which is annoying because very often it is useful to look at that file's resulting diff once more to confirm that conflicts were resolved correctly, and finding it again can be cumbersome when there are many changed files. So keep it selected. Of course, this only helps for the last (or only) conflicted files; when there are multiple, a resolved file disappears from the panel until all are resolved, which makes it hard to double-check the resulting diffs. Doing it afterwards is not easy because you'd have to remember which files were conflicting. This needs a different solution, but for the special case of only a single conflicting file this is already a big improvement. |
||
|---|---|---|
| .. | ||
| click_arrow_to_collapse.go | ||
| collapse_expand.go | ||
| copy_menu.go | ||
| dir_with_untracked_file.go | ||
| discard_all_dir_changes.go | ||
| discard_all_dir_changes_when_filtering.go | ||
| discard_range_select.go | ||
| discard_staged_changes.go | ||
| discard_unstaged_dir_changes.go | ||
| discard_unstaged_dir_changes_when_filtering.go | ||
| discard_unstaged_file_changes.go | ||
| discard_unstaged_range_select.go | ||
| discard_various_changes.go | ||
| discard_various_changes_range_select.go | ||
| exclude_without_info_dir.go | ||
| gitignore.go | ||
| gitignore_special_characters.go | ||
| remember_commit_message_after_fail.go | ||
| rename_similarity_threshold_change.go | ||
| renamed_files.go | ||
| renamed_files_no_root_item.go | ||
| shared.go | ||
| stage_all_without_changed_files.go | ||
| stage_children_range_select.go | ||
| stage_deleted_range_select.go | ||
| stage_range_select.go | ||