fix(remote-ssh): cap and workspace keying merge follow-up#242
Closed
bobleer wants to merge 3 commits intoGCWing:mainfrom
Closed
fix(remote-ssh): cap and workspace keying merge follow-up#242bobleer wants to merge 3 commits intoGCWing:mainfrom
bobleer wants to merge 3 commits intoGCWing:mainfrom
Conversation
Collaborator
Author
|
Closing: |
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
1 participant
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.
Summary
Syncs fork
mainwith upstream after PR #241 and carries local fixes for remote SSH.Commits (vs
upstream/main)f8abfe5— fix: remote-ssh capd42fd40— merge upstream/main; resolve remote-SSH workspace keying conflicts9ad3f8f— merge upstream/main after PR feat(web-ui): disk file versioning, tab state, and FS error helpers #241Notes
Opened via
gh pr createto validate that forkmainis ahead ofGCWing/BitFun:mainby these commits. Please review especially remote-SSH workspace keying and cap behavior.