chore: sync fork with upstream sssxks/end-cli#1
Merged
Conversation
…box issue with firefox launch
Co-authored-by: u-00a0 <null@hcaor.org>
使得“外部消耗”一栏能够接受浮点数
Copilot created this pull request from a session on behalf of
u-00a0
March 24, 2026 19:10
View session
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
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.
Fork
u-00a0/end-clihad diverged from upstreamsssxks/end-cliby one commit (feat: add Tauri v2 architecture and backend abstraction) that conflicted with upstream's independently-landed Tauri implementation.Changes
upstream/main(68eccc8) intocopilot/rebase-fork; all conflicts resolved in favor of upstreamweb/src-tauri/.cargo/config.toml,web/src-tauri/icons/.gitkeepCargo.tomlworkspace members to upstream state (removedweb/src-taurientry)Branch now tracks upstream exactly —
git diff HEAD upstream/mainis empty.