OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

docs: update sync vscode instructions (#4879)

Browse Source 
* docs: update sync vscode instructions

* fixup!

* fixup: formatting
This commit is contained in:
Joe Previte 2022-02-17 15:18:17 -07:00 committed by GitHub
parent 94f378c196
commit 01a0e95174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/MAINTAINING.md
View File

@ -220,9 +220,10 @@ This is currently automated with the release process.
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: 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:
1. `git checkout -b vscode-update` - Create a new branch locally based off `main` 1. `git checkout -b vscode-update` - Create a new branch locally based off `main`
2. `git fetch upstream` - Fetch upstream (VS Code)'s latest `main` branch 2. `git fetch upstream` - Fetch upstream (VS Code)'s latest branches
3. `git merge upstream/main` - Merge it locally 3. `git merge upstream/release/1.64` - Merge it locally
1. If there are merge conflicts, fix them locally 1. replace `1.64` with the version you're upgrading to
1. If there are merge conflicts, commit first, then fix them locally.
4. Open a PR merging your branch (`vscode-update`) into `main` and add the code-server review team 4. Open a PR merging your branch (`vscode-update`) into `main` and add the code-server review team
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). 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).