Skip to content

Commit 93bc69c

Browse files
committed
Removed the TypeScript submodule
1 parent 53f52aa commit 93bc69c

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "TypeScript"]
2-
path = TypeScript
3-
url = https://github.com/billti/TypeScript

TypeScript

-1
This file was deleted.

readme.md

-22
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,5 @@ This repo is for experimenting with various language service implementations.
55

66
Run `npm install` to install the dev dependencies. e.g.
77

8-
To ensure the TypeScript submodule is sync'ed and up to date run `git submodule update`, then change into the TypeScript folder and ensure it's dependencies are installed and it is built locally by running `npm install` and `jake local`.
9-
108
Build back in the './src' folder in the main repo by running `tsc`. Launch the web site with `npm start` and browse to http://localhost:3000.
119

12-
## Working with the submodule
13-
This project contains a TypeScript fork as a submodule for experimenting with. Submodules in Git are tricky. To keep it up to date with the official Microsoft repo:
14-
15-
- Ensure any changes you want to keep are committed locally on a working branch.
16-
- Change directory to the `./TypeScript` submodule folder.
17-
- Ensure the 'upstream' remote points to the official repo (`git remote -v`)
18-
- If not, add it (`git remote add upstream https://github.com/Microsoft/TypeScript.git`)
19-
- Fetch the changes from upstream (`git fetch upstream`)
20-
- Check out the master branch (`git checkout master`)
21-
- Merge the changes from upstream master in (`git merge upstream/master`)
22-
- You may then want to merge the latest `master` into your working branch (`git checkout <branch>`, `git merge master`).
23-
- Update the remote fork (`git push origin`)
24-
25-
To keep the submodule up to date in the parent:
26-
27-
- Do any work required in a branch in the TypeScript submodule. (Ensure you are on a branch before doing the work, and not a detached HEAD - as if often the case in submodules).
28-
- Ensure the submodule changes are pushed up to the remote (so anyone else using the repo can pull the submodule commit).
29-
- Change to the root of this repo, do a `git status` and `git diff` to ensure the submodule commit has changed.
30-
- Add and commit the change in the parent repo (`git add TypeScript` and `git commit`).
31-
- Push the changes to the remote.

0 commit comments

Comments
 (0)