[Discussion] What are the steps to update an existing project?

TeamMaestro / angular-native-seed

Build web apps and NativeScript applications from one codebase using the AngularCLI.

265 stars 71 forks source link

[Discussion] What are the steps to update an existing project? #43

Closed sebawita closed 7 years ago

sebawita commented 7 years ago

I've been asked in my article by Dinesh about the required steps to update an existing angular-native-seed clone. I am not 100% sure what is the best way to approach it. This looks like a good topic to have an open discussion about.

sean-perkins commented 7 years ago

Set the upstream for your git project to the seed's repository: git remote add upstream https://github.com/TeamMaestro/angular-native-seed.git

& the rest is stolen/repeat of what's mentioned in Nathan's seed.

git fetch upstream - This will fetch latest upstream.
git merge upstream/master - This will merge in upstream changes.
Handle any conflicts to get latest upstream into your app.
Continue building your app.

donburgess commented 7 years ago

I would recommend using git rebase upstream/master over git merge. This will keep all your development commits after the seed's changes.