Am I doing the pull/merge correctly? about angular-seed-advanced HOT 5 CLOSED

Hi,
I think the problem is that you forked the project.

1 > create dir my_project (or whatever)
2 > cd my_project
3 > git init
4 > git remote add origin BASED ON YOUR OWN REPO
5 > eventually git pull origin master to retrieve your project
6 > git remote add upstream SEED_PROJECT_URL
7 > git fetch upstream
8 > git merge upstream/master
9 > git add .
10 > git commit -m "Your message"
11 > git push origin master

You now have your own project, on your repository and still able to merge SEED_PROJECT changes.

Hope it helped.

Regards,
Sebastien

from angular-seed-advanced.

@fourctv How long has it been since you first downloaded seed?
I assume this is first time you've attempted a fetch and merge?

Usually best to merge upstream master in after downloading and setting up the remotes, this ensures that git is sorted before waiting to merge much later after you've made significant changes.

from angular-seed-advanced.

I need to setup a gitter... at moment you can chat me on google chat: walkerrunpdx

from angular-seed-advanced.

@NathanWalker @sebfag I guess I missing the first fetch/merge after downloading seed.

I've made very little changes to the seed itself. I have all my stuff as separate components/files. Most of changes were in package.json & typings.jason to add some 3rd party libraries.

I guess I'll start over, grab a new seed and then move in my stuff.

thanks for the help, closing this now.

from angular-seed-advanced.

@fourctv One good thing about the setup is if you do get into merge hell, if you had just created a new framework for your codebase and just created new components, it should be easy to download fresh zip and drop the folders of your custom stuff in and away you go. 👍

Chat me on google if you need help.

from angular-seed-advanced.