Skip to content

Commit 5a760f6

Browse files
authored
Link upstream sync section in MAINTAINING to CONTRIBUTING
1 parent 38e57a3 commit 5a760f6

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

docs/MAINTAINING.md

+2-11
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,9 @@ We publish code-server as a npm package [here](https://www.npmjs.com/package/cod
214214

215215
This is currently automated with the release process.
216216

217-
## Syncing with Upstream VS Code
217+
## Syncing with upstream Code
218218

219-
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:
220-
221-
1. `git checkout -b vscode-update` - Create a new branch locally based off `main`
222-
2. `git fetch upstream` - Fetch upstream (VS Code)'s latest branches
223-
3. `git merge upstream/release/1.64` - Merge it locally
224-
1. replace `1.64` with the version you're upgrading to
225-
1. If there are merge conflicts, commit first, then fix them locally.
226-
4. Open a PR merging your branch (`vscode-update`) into `main` and add the code-server review team
227-
228-
Ideally, our fork stays as close to upstream as possible. See the differences between our fork and upstream [here](https://github.com/microsoft/vscode/compare/main...coder:main).
219+
Refer to the [contributing docs](https://coder.com/docs/code-server/latest/CONTRIBUTING#version-updates-to-code) for information on how to update Code within code-server.
229220

230221
## Testing
231222

0 commit comments

Comments
 (0)