|
2 | 2 | <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> |
3 | 3 | # Contributing |
4 | 4 |
|
5 | | -- [Pull Requests](#pull-requests) |
6 | | -- [Requirements](#requirements) |
7 | | -- [Development Workflow](#development-workflow) |
8 | | - - [Updating VS Code](#updating-vs-code) |
9 | | -- [Build](#build) |
10 | | -- [Structure](#structure) |
11 | | - - [Modifications to VS Code](#modifications-to-vs-code) |
12 | | - - [Currently Known Issues](#currently-known-issues) |
| 5 | +- [Contributing](#contributing) |
| 6 | + - [Pull Requests](#pull-requests) |
| 7 | + - [Requirements](#requirements) |
| 8 | + - [Development Workflow](#development-workflow) |
| 9 | + - [Updating VS Code](#updating-vs-code) |
| 10 | + - [Notes about Changes](#notes-about-changes) |
| 11 | + - [Build](#build) |
| 12 | + - [Structure](#structure) |
| 13 | + - [Modifications to VS Code](#modifications-to-vs-code) |
| 14 | + - [Currently Known Issues](#currently-known-issues) |
13 | 15 |
|
14 | 16 | <!-- END doctoc generated TOC please keep comment here to allow auto update --> |
15 | 17 |
|
@@ -59,14 +61,17 @@ To develop inside an isolated Docker container: |
59 | 61 |
|
60 | 62 | ### Updating VS Code |
61 | 63 |
|
62 | | -If you need to update VS Code, you can update the subtree with one line. Here's an example using the version 1.52: |
| 64 | +To update VS Code, follow these steps: |
| 65 | +1. Run `yarn update:vscode`. |
| 66 | +2. Enter a version. Ex. 1.53 |
| 67 | +3. This will open a draft PR for you. |
| 68 | +4. There will be merge conflicts. First commit them. |
| 69 | + 1. We do this because if we don't, it will be impossible to review your PR. |
| 70 | +5. Once they're all fixed, test code-server locally and make sure it all works. |
63 | 71 |
|
64 | | -```shell |
65 | | -# Add vscode as a new remote if you haven't already and fetch |
66 | | -git remote add -f vscode https://github.com/microsoft/vscode.git |
| 72 | +#### Notes about Changes |
67 | 73 |
|
68 | | -git subtree pull --prefix lib/vscode vscode release/1.52 --squash --message "Update VS Code to 1.52" |
69 | | -``` |
| 74 | +- watch out for updates to `lib/vscode/src/vs/code/browser/workbench/workbench.html`. You may need to make changes to `src/browser/pages/vscode.html` |
70 | 75 |
|
71 | 76 | ## Build |
72 | 77 |
|
|
0 commit comments