Skip to content

Revert "settings: Await config worktree before opening settings.json"#50380

Merged
Veykril merged 1 commit intomainfrom
revert-47199-settings
Feb 28, 2026
Merged

Revert "settings: Await config worktree before opening settings.json"#50380
Veykril merged 1 commit intomainfrom
revert-47199-settings

Conversation

@Veykril
Copy link
Member

@Veykril Veykril commented Feb 28, 2026

Reverts #47199

Closes #50237

Release Notes:

  • Fixed a bug that prevented settings files from opening on remotes

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 28, 2026
@Veykril
Copy link
Member Author

Veykril commented Feb 28, 2026

/cherry-pick preview
/cherry-pick stable

@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 28, 2026
@Veykril Veykril enabled auto-merge (squash) February 28, 2026 09:55
@Veykril Veykril merged commit 6401cc3 into main Feb 28, 2026
39 checks passed
@Veykril Veykril deleted the revert-47199-settings branch February 28, 2026 09:58
github-actions bot pushed a commit that referenced this pull request Feb 28, 2026
…#50380)

Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes
github-actions bot pushed a commit that referenced this pull request Feb 28, 2026
…#50380)

Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes
zed-zippy bot added a commit that referenced this pull request Feb 28, 2026
…#50380) (cherry-pick to preview) (#50382)

Cherry-pick of #50380 to preview

----
Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes

Co-authored-by: Lukas Wirth <lukas@zed.dev>
zed-zippy bot added a commit that referenced this pull request Feb 28, 2026
…#50380) (cherry-pick to stable) (#50383)

Cherry-pick of #50380 to stable

----
Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes

Co-authored-by: Lukas Wirth <lukas@zed.dev>
tahayvr pushed a commit to tahayvr/zed that referenced this pull request Mar 4, 2026
…zed-industries#50380)

Reverts zed-industries#47199

Closes zed-industries#50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cannot open keymap and settings files if zed is opened with WSL

1 participant