From 91a58498af9488280ad86bda275e72adf1178496 Mon Sep 17 00:00:00 2001 From: Devin Rhode Date: Thu, 9 Jul 2020 15:18:00 -0500 Subject: [PATCH] Add steps to pull in changes from starter kit --- README.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ba2f6a2..dfb03660 100644 --- a/README.md +++ b/README.md @@ -280,4 +280,24 @@ to the `scripts` section in your `package.json`. ```sh npm run start -``` \ No newline at end of file +``` + + +### Pull changes from this starter kit into your project + +If you are starting a new project: +``` +git clone git@github.com:microsoft/TypeScript-Babel-Starter.git my-app +cd my-app +git remote rename origin TypeScript-Babel-Starter +git remote add origin git@github.com:your-company/your-project.git +git pull TypeScript-Babel-Starter master +``` + +If you have an existing project, you'll need for force merge unrelated histories. (untested) +``` +git remote add TypeScript-Babel-Starter git@github.com:microsoft/TypeScript-Babel-Starter.git +git fetch TypeScript-Babel-Starter +git checkout -b TypeScript-Babel-Starter TypeScript-Babel-Starter/master +git merge TypeScript-Babel-Starter --allow-unrelated-histories +```