Skip to content

Develop - #8

Merged
stawan15 merged 7 commits into
mainfrom
develop
Jul 19, 2026
Merged

Develop#8
stawan15 merged 7 commits into
mainfrom
develop

Conversation

@stawan15

Copy link
Copy Markdown
Owner

No description provided.

stawan15 added 6 commits July 19, 2026 12:45
feat: add header bar with project name and git branch, and update log…
style: update action menu titles with Nerd Font icons
feat: replace action list panel with a centered keyboard-driven menu …
@stawan15

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	kamal.go
#	main.go
#	styles.go

Copilot AI commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Merged origin/main into develop and resolved all conflicts (commit de37671):

  • kamal.go: Combined key fields from develop with Nerd Font icon titles from main; also added the three actions that existed only in main (Setup, App Details, App Boot) with new keyboard shortcuts (U, A, b).
  • main.go: Kept develop's keyboard-driven menu overlay; removed the old action list panel code from main.
  • styles.go: Kept develop's menu overlay styles.

@stawan15
stawan15 merged commit 2fb978b into main Jul 19, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants