fix: keep the search bar visible during a conflict - #90
Open
arumata wants to merge 1 commit into
Open
Conversation
The search bar (and the Jump to HEAD button next to it) was hidden whenever a conflict or a paused rebase was active, because the SearchBar was rendered only when !conflict && !rebasePaused. The conflict banner is a separate top-level banner, so nothing needs to take the search slot here — only bisect still replaces the search bar with its own banner (issue the0807#69).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The search bar (and Jump to HEAD) was hidden whenever a conflict or paused rebase was active, because the SearchBar rendered only when
!conflict && !rebasePaused. The conflict banner is a separate top-level banner, so nothing needs to take the search slot — only bisect still replaces it with its own banner.\n\nFixes #69.