Skip to content

Replace turn chips with dropdown and add conflict file submenu#2

Merged
BunsDev merged 1 commit intomainfrom
okcode/dropdown-instead-of-pills
Mar 27, 2026
Merged

Replace turn chips with dropdown and add conflict file submenu#2
BunsDev merged 1 commit intomainfrom
okcode/dropdown-instead-of-pills

Conversation

@BunsDev
Copy link
Copy Markdown
Member

@BunsDev BunsDev commented Mar 27, 2026

Summary

  • Replaced the DiffPanel turn chip strip with a compact dropdown selector for switching between changes.
  • Simplified the header by removing horizontal scroll handling and chip-specific navigation logic.
  • Expanded the Git actions conflict UI to show a submenu of conflicted files, with per-file editor opening and an Open all action for multi-file conflicts.

Testing

  • Not run
  • No automated checks were executed for this branch in this pass

- Use a select for diff turn navigation instead of a scrollable chip strip
- Add per-file conflicted file menu items plus an Open all action
@github-actions github-actions Bot added size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Mar 27, 2026
@BunsDev BunsDev merged commit 4c5abbd into main Mar 27, 2026
6 of 7 checks passed
@BunsDev BunsDev deleted the okcode/dropdown-instead-of-pills branch March 28, 2026 00:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant