From 01a0e95174accaa786991306bf2a370f302b36a5 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 17 Feb 2022 15:18:17 -0700 Subject: [PATCH 1/2] docs: update sync vscode instructions (#4879) * docs: update sync vscode instructions * fixup! * fixup: formatting --- docs/MAINTAINING.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index 5f02c260..8bec1e9c 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -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: 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 -3. `git merge upstream/main` - Merge it locally - 1. If there are merge conflicts, fix them locally +2. `git fetch upstream` - Fetch upstream (VS Code)'s latest branches +3. `git merge upstream/release/1.64` - Merge it 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 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). From d7c1894fb4ceebbc6ff6f69b854d4623c97bc485 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 18 Feb 2022 10:06:58 -0800 Subject: [PATCH 2/2] Update requirements.md (#4882) Grammar/typo correction. Co-authored-by: Joe Previte --- docs/requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.md b/docs/requirements.md index 128e18fd..363b6762 100644 --- a/docs/requirements.md +++ b/docs/requirements.md @@ -33,7 +33,7 @@ new Compute Engine VM instance: 4. Choose the **region** that's closest to you based on [GCP ping](https://gcping.com/). 5. Choose a **zone** (any option is fine). -6. We recommend choose an **E2 series instance** from the [general-purpose +6. We recommend choosing an **E2 series instance** from the [general-purpose family](https://cloud.google.com/compute/docs/machine-types#general_purpose). 7. Change the instance type to **custom** and set at least **2 cores** and **2 GB of RAM**. You can add more resources if desired, though you can also edit