Skip to content

feat: show status in starship also#12

Open
puria wants to merge 2 commits into
mainfrom
starship
Open

feat: show status in starship also#12
puria wants to merge 2 commits into
mainfrom
starship

Conversation

@puria

@puria puria commented Apr 30, 2026

Copy link
Copy Markdown
Owner

No description provided.

@puria

puria commented Apr 30, 2026

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	README.md
#	main_test.go
#	shell.go

Co-authored-by: puria <10379+puria@users.noreply.github.com>

Copilot AI commented Apr 30, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved in b77033b. Merged origin/main into starship, combining both new (from main) and starship (from this branch) in the shell passthrough lists, reserved command docs, and tests. All tests pass.

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