|
1 | 1 | <!-- START doctoc generated TOC please keep comment here to allow auto update --> |
2 | 2 | <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> |
| 3 | + |
3 | 4 | # Contributing |
4 | 5 |
|
5 | 6 | - [Requirements](#requirements) |
@@ -96,15 +97,18 @@ re-apply the patches. |
96 | 97 | ### Version updates to Code |
97 | 98 |
|
98 | 99 | 1. Update the `lib/vscode` submodule to the desired upstream version branch. |
99 | | -2. Apply the patches (`quilt push -a`) or restore your stashed changes. At this |
| 100 | +1. `cd lib/vscode && git checkout release/1.66` |
| 101 | +1. `cd ../../ && git submodule update --recursive` |
| 102 | +1. `git add lib && git commit -m "chore: update Code"` |
| 103 | +1. Apply the patches (`quilt push -a`) or restore your stashed changes. At this |
100 | 104 | stage you may need to resolve conflicts. For example use `quilt push -f`, |
101 | 105 | manually apply the rejected portions, then `quilt refresh`. |
102 | | -3. From the code-server **project root**, run `yarn install`. |
103 | | -4. Test code-server locally to make sure everything works. |
104 | | -5. Check the Node.js version that's used by Electron (which is shipped with VS |
| 106 | +1. From the code-server **project root**, run `yarn install`. |
| 107 | +1. Test code-server locally to make sure everything works. |
| 108 | +1. Check the Node.js version that's used by Electron (which is shipped with VS |
105 | 109 | Code. If necessary, update your version of Node.js to match. |
106 | | -6. Commit the updated submodule and patches to `code-server`. |
107 | | -7. Open a PR. |
| 110 | +1. Commit the updated submodule and patches to `code-server`. |
| 111 | +1. Open a PR. |
108 | 112 |
|
109 | 113 | ### Patching Code |
110 | 114 |
|
|
0 commit comments