From b1dee3c1d8bcca46c0c9aa38dd9850785e8e47b7 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 17 Feb 2022 10:20:45 -0700 Subject: [PATCH 1/3] docs: update sync vscode instructions --- docs/MAINTAINING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index 5f02c260c742..5d0cc1070cf8 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -220,8 +220,9 @@ 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 +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, fix them locally 4. Open a PR merging your branch (`vscode-update`) into `main` and add the code-server review team From 1c3b45c247adf141a91bf5ff989c97e4d01b74eb Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 17 Feb 2022 11:03:46 -0700 Subject: [PATCH 2/3] fixup! --- docs/MAINTAINING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index 5d0cc1070cf8..4e2b1e8c9a5a 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -1,5 +1,6 @@ + # Maintaining - [Team](#team) @@ -223,7 +224,7 @@ The VS Code portion of code-server lives under [`coder/vscode`](https://github.c 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, fix them locally + 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 2bec01e488c3a76a6e7e6d677477265e011253c9 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 17 Feb 2022 11:29:16 -0700 Subject: [PATCH 3/3] fixup: formatting --- docs/MAINTAINING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index 4e2b1e8c9a5a..8bec1e9c4d7f 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -1,6 +1,5 @@ - # Maintaining - [Team](#team)