Skip to content

Commit b1dee3c

Browse files
committed
docs: update sync vscode instructions
1 parent 94f378c commit b1dee3c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

docs/MAINTAINING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,9 @@ This is currently automated with the release process.
220220
The VS Code portion of code-server lives under [`coder/vscode`](https://github.com/coder/vscode). To update VS Code for code-server, follow these steps:
221221

222222
1. `git checkout -b vscode-update` - Create a new branch locally based off `main`
223-
2. `git fetch upstream` - Fetch upstream (VS Code)'s latest `main` branch
224-
3. `git merge upstream/main` - Merge it locally
223+
2. `git fetch upstream` - Fetch upstream (VS Code)'s latest branches
224+
3. `git merge upstream/release/1.64` - Merge it locally
225+
1. replace `1.64` with the version you're upgrading to
225226
1. If there are merge conflicts, fix them locally
226227
4. Open a PR merging your branch (`vscode-update`) into `main` and add the code-server review team
227228

0 commit comments

Comments
 (0)