1. Description
During a conflict (tested so far only with Rebase Conflict) the banner appears showing conflicting files, but this replaces the search bar along with the buttons beside it
2. Steps to Reproduce
git rebase --onto HEAD~10 HEAD~2 HEAD to try force a conflict (ymmv)- Open Git Graph+
3. Expected Behavior
The search bar and buttons are still visible; and I can still search and/or click the "Jump to HEAD" button.
4. Actual Behavior
The search bar is gone completely.
5. Screenshots or Logs
6. Environment
- OS: Windows 11
- VS Code version: 1.128.0
- Git Graph+ version: 1.7.3
7. Additional Context
I didn't test merge conflicts but I guess its probably the same
1. Description
During a conflict (tested so far only with Rebase Conflict) the banner appears showing conflicting files, but this replaces the search bar along with the buttons beside it
2. Steps to Reproduce
git rebase --onto HEAD~10 HEAD~2 HEADto try force a conflict (ymmv)3. Expected Behavior
The search bar and buttons are still visible; and I can still search and/or click the "Jump to HEAD" button.
4. Actual Behavior
The search bar is gone completely.
5. Screenshots or Logs
6. Environment
7. Additional Context
I didn't test merge conflicts but I guess its probably the same