How to synchronize code with vscode

gitpod-io/vscode is forked from vscode, and some commit came from vscode like 8f58c1
How to synchronize the code between gitpod/vscode and vscode ?
Pull from vscode or other way?

We rebase it once a month and fix API breakage.

Is there a lot of conflict? Will it be difficult to solve?

Sometimes is hard, sometimes is easy. 1.59 is already in pipeline btw: [code] desktop support with 1.59 upgrade by akosyakov · Pull Request #5107 · gitpod-io/gitpod · GitHub

1 Like