Create a gist now

Instantly share code, notes, and snippets.

Angular 2.0 Beta 9 to Angular 2.0 RC1
git checkout -b 2.0.0-rc1
git remote add upstream https://github.com/mgechev/angular2-seed.git
± git remote -v
origin https://github.com/mraible/angular2-tutorial.git (fetch)
origin https://github.com/mraible/angular2-tutorial.git (push)
upstream https://github.com/mgechev/angular2-seed.git (fetch)
upstream https://github.com/mgechev/angular2-seed.git (push)
± git merge upstream/master
Removing tools/config/seed.config.interface.ts
Removing src/sw.js
Removing src/shared/services/name-list.service.ts
Removing src/shared/services/name-list.service.spec.ts
CONFLICT (modify/delete): src/main.ts deleted in upstream/master and modified in HEAD. Version HEAD of src/main.ts left in tree.
Removing src/hot_loader_main.ts
Removing src/home/components/home.component.ts
Removing src/home/components/home.component.spec.ts
Auto-merging src/client/app/shared/toolbar/toolbar.component.css
Auto-merging src/client/app/+home/home.component.html
Auto-merging src/client/app/+home/home.component.e2e-spec.ts
Removing src/app/components/toolbar.component.ts
Removing src/app/components/navbar.component.ts
CONFLICT (modify/delete): src/app/components/navbar.component.html deleted in upstream/master and modified in HEAD. Version HEAD of src/app/components/navbar.component.html left in tree.
CONFLICT (modify/delete): src/app/components/app.component.ts deleted in upstream/master and modified in HEAD. Version HEAD of src/app/components/app.component.ts left in tree.
Removing src/app/components/app.component.spec.ts
CONFLICT (modify/delete): src/app/components/app.component.e2e.ts deleted in upstream/master and modified in HEAD. Version HEAD of src/app/components/app.component.e2e.ts left in tree.
Removing src/about/components/about.component.ts
Removing src/about/components/about.component.spec.ts
Removing src/about/components/about.component.e2e.ts
Automatic merge failed; fix conflicts and then commit the result.
Auto-merging src/client/app/+home/home.component.e2e-spec.ts
Removing src/app/components/toolbar.component.ts
Removing src/app/components/navbar.component.ts
CONFLICT (modify/delete): src/app/components/navbar.component.html deleted in upstream/master and modified in HEAD. Version HEAD of src/app/components/navbar.component.html left in tree.
CONFLICT (modify/delete): src/app/components/app.component.ts deleted in upstream/master and modified in HEAD. Version HEAD of src/app/components/app.component.ts left in tree.
Removing src/app/components/app.component.spec.ts
CONFLICT (modify/delete): src/app/components/app.component.e2e.ts deleted in upstream/master and modified in HEAD. Version HEAD of src/app/components/app.component.e2e.ts left in tree.
Removing src/about/components/about.component.ts
Removing src/about/components/about.component.spec.ts
Removing src/about/components/about.component.e2e.ts
Automatic merge failed; fix conflicts and then commit the result.
Moved files, made changes
rm -rf node_modules
npm install
npm ERR! Failed at the angular2-seed@0.0.0 postinstall script 'typings install && gulp check.versions && npm prune && gulp webdriver'.
rm -rf typings
npm install
npm start
http://localhost:5555/node_modules/angular2/package.json Failed to load resource: the server responded with a status of 404 (Not Found)
Find and replace 'angular2/*' with '@angular/*'
Fixed a number of paths, routes, etc.
https://www.illucit.com/blog/2016/05/angular2-release-candidate-1-rc1-changes/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment