Moritz Borgmann mborgmann

## gist:8024315

      
              1 file
            
          
              1 fork
            
          
              2 comments
            
          
              4 stars
            
          
                evillemez
                / gist:8024315
            
            
              Created
              December 18, 2013 15:32
            
              
                On deploying apps w/ Symfony and Angular.js
              
          
    Project Deployment with Symfony2 & Angular.js

Symfony2 and Angular.js make a great, robust combintaion.  Integrating them isn't immediately obvious, however.  Both communities come with their own standards and suite of tools for managing the development process, and sometimes those tools conflict.
On the Symfony side, you mainly deal with composer for managing your dependencies, a few Symfony commands in your project, and any other tools you add into the mix, like phpunit.
On the Angular side, you'll probably end up using npm, bower and probably grunt for automating some of the pain.
The short answer


## gist:1885435

      
              1 file
            
          
              867 forks
            
          
              188 comments
            
          
              2991 stars
            
          
                CristinaSolana
                / gist:1885435
            
            
              Created
              February 22, 2012 14:56
            
              
                Keeping a fork up to date
              
          
    1. Clone your fork:

git clone git@github.com:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream