We use a subtree deployment a l&#225; [this Gist](https://gist.github.com/cobyism/4730490) to deploy a subdirectory of our [Yeoman](http://yeoman.io/) project. In our case, the branch is called _production_, not _gh-pages_.

This worked perfectly until yesterday when the Git server rejected the command `git subtree push --prefix dist origin production`, saying

     ! [rejected]        9fe1683aa574eae33ee6754aad702488e0bd37df -&gt; production (non-fast-forward)
    error: failed to push some refs to &#39;git@gitlab.sdstate.edu:web-and-new-media/graduation2015.git&#39;
    hint: Updates were rejected because a pushed branch tip is behind its remote
    hint: counterpart.

If I switch to the production branch locally (which is clean), `git pull` returns `Your branch is up-to-date with &#39;origin/production&#39;.` even if I use the `--rebase` option.

I can see the contents of the production branch on the server through our web UI and there&#39;s nothing there that shouldn&#39;t be, just the compiled output of our `dist` directory like I&#39;d expect.

To that end, it seems like I should safely be able to force an overwrite of these files, but how? `git subtree push` doesn&#39;t have a `--force` option.

How do I force a subtree push to overwrite remote changes?

I am developing an app that can utilize sails.js for back-end and AngularJS for Front-end. I thought that I&#39;ll create an Angular App using Yeoman-angular generator https://github.com/yeoman/generator-angular, and once I am done with the front-end logic I&#39;ll create a sails app using,

 1. npm install -g sails
 2. sails new app

And then I&#39;ll transfer all my AngularJS files to the Sails folder.

But the thing is that AngularJS creates creates a folder hierarchy like this https://github.com/rishy/angular-jade-stylus-seed and on running &quot;grunt server&quot; a &quot;dist&quot; folder is created which contains the final production version.

On the other hand, after &quot;sails new app&quot; folder hierarchy for sails app is like.

 - api
   - adapters/
   - controllers/
   - models/
   - policies/
   - services/
 - assets
   - images/
   - js/
   - styles/
   - favicon.ico
   - robots.txt
 - config/
 - node_modules/
 - views
   - home/
   - 403.ejs
   - 404.ejs
   - 500.ejs
   - layout.ejs
 - Gruntfile.js
 - app.js
 - package.JSON


So, My questions are:

 1. Now, how do I transfer my Angular Files to this sails directory and how should I structure it?
 2. Since sails uses &quot;sails lift&quot; to start a server and angular uses &quot;grunt server&quot;, which one of those should I use to start the server for my sailsJs + AngularJs app and what about the &quot;dist&quot; folder which is created after AngularJS?
 3. What changes will I have to make in the Gruntfile.js, since it should now contain the code from both Angular and Sails?
 4. Where should I keep my different views and style files and how should I access those form Angular or from Sails?

I think lot of people are facing this similar problem since AngularJS and SailsJs are all the rage currently. There should be a robust boilerplate to create an AngularJS + SailsJS app, which sadly is missing right now.



AngularJS + sails.js

**I have just reinstalled Ubuntu 12.04 LTS, and before anything else i did these steps**:

1. Installed Node via package manager with the following script

        sudo apt-get update
        
        sudo apt-get install python-software-properties python g++ make
        
        sudo add-apt-repository ppa:chris-lea/node.js
        
        sudo apt-get update
        
        sudo apt-get install nodejs
        
2. Tried to install yeoman, express, n, yeoman&#39;s generators globally and all of them returned the same error

    &gt; npm ERR! Error: EACCES, symlink &#39;../lib/node_modules/n/bin/n&#39;
    
    &gt; npm ERR!  { [Error: EACCES, symlink &#39;../lib/node_modules/n/bin/n&#39;] errno: 3, code: &#39;EACCES&#39;, path: &#39;../lib/node_modules/n/bin/n&#39; }
    
    &gt; npm ERR! 
    
    &gt; npm ERR! Please try running this command again as root/Administrator.
    
    &gt; npm ERR! System Linux 3.8.0-29-generic
    
    &gt; npm ERR! command &quot;/usr/bin/node&quot; &quot;/usr/bin/npm&quot; &quot;install&quot; &quot;-g&quot; &quot;-d&quot; &quot;n&quot;
    
    &gt; npm ERR! cwd /home/heberlz
    
    &gt; npm ERR! node -v v0.10.20
    
    &gt; npm ERR! npm -v 1.3.11
    
    &gt; npm ERR! path ../lib/node_modules/n/bin/n
    
    &gt; npm ERR! code EACCES
    
    &gt; npm ERR! errno 3
    
    &gt; npm ERR! stack Error: EACCES, symlink &#39;../lib/node_modules/n/bin/n&#39;
    
    &gt; npm ERR! 
    
    &gt; npm ERR! Additional logging details can be found in:
    
    &gt; npm ERR!     /home/heberlz/npm-debug.log
    
    &gt; npm ERR! not ok code 0

3. **Reclaimed ownership of the following folders recursively** ~/.npm, /usr/lib/node, /usr/lib/node_modules, and of the following symlinks /usr/bin/node, /usr/bin/nodejs **with absolutely no success**

I need to install yeoman and its generators without sudo not to be in trouble later on :(

NPM modules won&#39;t install globally without sudo

Usually I can install a library using **npm** but today when installing yeoman I encountered this errors. Please help to figure out what&#39;s root cause.

    D:\Works\phonegap\ionic\todo&gt;npm install -g yo
        module.js:340
        throw err;
              ^
    Error: Cannot find module &#39;C:\Program Files\nodejs\node_modules\npm\bin\node_modules\npm\bin\npm-cli.js&#39;
 
    at Function.Module._resolveFilename (module.js:338:15)
    at Function.Module._load (module.js:280:25)
    at Function.Module.runMain (module.js:497:10)
    at startup (node.js:119:16)
    at node.js:906:3

I looked into the folder:
&gt; C:\Program Files\nodejs\node_modules\npm\bin\

  but don&#39;t see **node_modules** folder as the error described.

I also try to find **npm-cli.js** and see it&#39;s actually in `C:\Program Files\nodejs\node_modules\npm\bin\`

NPM: npm-cli.js not found when running npm

I&#39;m using &quot;yeoman&quot; and &quot;bower&quot; on windows 7 but got the following error when I create the app

    yo webapp

The error is 

    bower not-cached    git://github.com/jlong/sass-bootstrap.git#~3.0.0
    bower resolve       git://github.com/jlong/sass-bootstrap.git#~3.0.0
    bower not-cached    git://github.com/Modernizr/Modernizr.git#~2.6.2
    bower resolve       git://github.com/Modernizr/Modernizr.git#~2.6.2
    bower not-cached    git://github.com/jquery/jquery.git#~1.10.2
    bower resolve       git://github.com/jquery/jquery.git#~1.10.2
    bower ECMDERR       Failed to execute &quot;git ls-remote --tags --heads git://github
    .com/jquery/jquery.git&quot;, exit code of #128
    
    Additional error details:
    fatal: unable to connect to github.com:
    github.com[0: 192.30.252.130]: errno=No error

The version of the yeoman, bower and node

    c:\yo-test&gt;bower -v
    1.2.8
    
    c:\yo-test&gt;yo -version
    1.1.2

    c:\yo-test&gt;node -v
    v0.10.15

Any suggestion is much appreciated. 


How to fix bower ECMDERR

I tried to install generator-angularjs using Yo ([Yoeman][1]) **without sudo**:

    npm install -g generator-angular

I get:

    Error: EACCES, mkdir &#39;/usr/lib/node_modules/generator-angular&#39;

When I type in `sudo yo`, yo tells me that I should not use sudo (which is perfectly understandable). 

I have a `~/node_modules` directory - why doesn&#39;t yo install its packages there?


  [1]: http://yeoman.io

npm / yeoman install generator-angular without sudo

I&#39;ve created a Yeoman generator and want my team to use it. 

What happens if I update my generator on Github? They installed the generator locally in an older version. Do they always have to install again to get the latest version? 

Team members don&#39;t know when updates happen and I don&#39;t want them to care too much about it. I just would like for them to use the latest version of the generator.

**What is the suggested way of updating generators?**

Thanks

What is the preferred way of updating Yeoman generators?

I&#39;m using the font library font awesome. It works when the project is not built/uglified with grunt. 

But when I&#39;m building the project with grunt it&#39;s not working. I get this error in console: .../fonts/fontawesome-webfont.woff?v=4.0.3 404 (Not Found) 

I&#39;ve scaffolded the project with yeoman.

This is my ref in index.html

        &lt;!-- build:css styles/fontawesome.css --&gt;
        &lt;link rel=&quot;stylesheet&quot; href=&quot;bower_components/font-awesome/css/font-awesome.min.css&quot;&gt;
        &lt;!-- endbuild --&gt;


Any ideas what can be wrong?

**Update**
I need to copy the folder /bower_components/font-awesome/fonts to dist/fonts. This needs to be done in the grunt-file. Probably under the &quot;copy&quot; options

    copy: {
      dist: {
        files: [{
          expand: true,
          dot: true,
          cwd: &#39;&lt;%= yeoman.app %&gt;&#39;,
          dest: &#39;&lt;%= yeoman.dist %&gt;&#39;,
          src: [
            &#39;*.{ico,png,txt}&#39;,
            &#39;.htaccess&#39;,
            &#39;bower_components/**/*&#39;,
            &#39;images/{,*/}*.{gif,webp}&#39;,
            &#39;styles/fonts/*&#39;
          ]
        }, {
          expand: true,
          cwd: &#39;.tmp/images&#39;,
          dest: &#39;&lt;%= yeoman.dist %&gt;/images&#39;,
          src: [
            &#39;generated/*&#39;
          ]
        }]
      },

But I&#39;m not really sure where to include this. 

Fontawesome is not working when project is built with grunt

I&#39;m using yeoman&#39;s backbone generator, and I ran this:

    bower install backbone.localStorage -S

And I manually had to insert this into index.html:

    &lt;script src=&quot;bower_components/backbone.localStorage/backbone.localStorage.js&quot;&gt;&lt;/script&gt;

Is there some way for bower to automatically insert `&lt;script&gt;` tags? I thought part of the benefit of bower was not having to figure out in which order to include your scripts?

All Yeoman Solutions on Gang of Coders

Total of 9 Yeoman Solutions