From 6fd048a3b79b854bf569efd50190fc971096b8d0 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Wed, 10 Sep 2014 22:52:32 +0100 Subject: [PATCH] docs(tutorial/steps-11&12): add warning about bower conflict error See: https://github.com/angular/angular-phonecat/issues/163#issuecomment-55181854 --- docs/content/tutorial/step_11.ngdoc | 9 ++++++++- docs/content/tutorial/step_12.ngdoc | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/content/tutorial/step_11.ngdoc b/docs/content/tutorial/step_11.ngdoc index 29ef1308c..7a8aec10c 100644 --- a/docs/content/tutorial/step_11.ngdoc +++ b/docs/content/tutorial/step_11.ngdoc @@ -49,8 +49,15 @@ and install this dependency. We can do this by running: npm install ``` +
+ **Warning:** If a new version of Angular has been released since you last ran `npm install`, then you may have a + problem with the `bower install` due to a conflict between the versions of angular.js that need to + be installed. If you get this then simply delete your `app/bower_components` folder before running + `npm install`. +
+
- If you have bower installed globally then you can run `bower install` but for this project we have + **Note:** If you have bower installed globally then you can run `bower install` but for this project we have preconfigured `npm install` to run bower for us.
diff --git a/docs/content/tutorial/step_12.ngdoc b/docs/content/tutorial/step_12.ngdoc index 0d1646a43..56eb96b75 100644 --- a/docs/content/tutorial/step_12.ngdoc +++ b/docs/content/tutorial/step_12.ngdoc @@ -59,8 +59,15 @@ We must ask bower to download and install this dependency. We can do this by run npm install ``` +
+ **Warning:** If a new version of Angular has been released since you last ran `npm install`, then you may have a + problem with the `bower install` due to a conflict between the versions of angular.js that need to + be installed. If you get this then simply delete your `app/bower_components` folder before running + `npm install`. +
+
- If you have bower installed globally then you can run `bower install` but for this project we have + **Note:** If you have bower installed globally then you can run `bower install` but for this project we have preconfigured `npm install` to run bower for us.