Integrating angular seed updates into your codebase

To integrate the latest updates from angular-seed into your own codebase, use the following git commands:

Warning: Your app in src\client will be overwritten. Make a copy to replace the overwritten files after the update.

# make a backup of your src\client folder
$ mv ./src/client ./src/client_backup

# Add the `angular-seed` repository as the `upstream` git remote
$ git remote add upstream https://github.com/mgechev/angular-seed

# combines `git fetch upstream` and `git merge upstream/master` into a single command;
# merges the latest commits from `angular-seed` into your current local branch
$ git pull upstream master  

# restore backup of src\client
$ rm -r ./src/client
$ mv ./src/client_backup ./src/client

After that you need to resolve the merge conflicts (if any) and you're ready to go!

# You can see pending merges in console like this:
$ grep --exclude-dir=node_modules -r . -e "<<<<<<< HEAD"