How to update a project?

[frranck]

Hi,
What is the procedure and what are the best practices to update an existing project ?
Would be good to have this addressed in the documentation.

[ghost]

@frranck typically with git projects what you'd want to do is add the kit as an upstream and pull from it once in a while:

git remote add upstream https://github.com/futurice/pepperoni-app-kit.git
git pull upstream master

I personally find the method heavy-handed as it tends to cause a lot of merge conflicts. Thankfully this project is somewhat limited in scope, so rather than running an pull you may just want to cherry-pick the upstream changes you decide you want to have in your project.

For keeping your project up-to-date dependency-wise consider using npm-check-updates and/or a Greenkeeper integration with your repo.

[jevakallio]

@frranck, thanks, great question. @jhabdas's advice is solid and following it should get you going.

There are a few things we want to do for improving the upgrade experience in the short/long term:

1. Move all the "sample" code (Counter, Colors etc.) from the master branch of the repository into a separate "sample app" branch, so changes to them don't swim downstream to projects that want to upgrade latest changes and will have already deleted that code.
2. Document the process of upgrading.
3. Start versioning Pepperoni and providing release notes, so changes are easier to understand.
4. (In the long term) create a command line pepperoni tool for scripting tasks like this.

Let's keep this issue open to track the upgrade experience improvements.

[frranck]

@jevakallio @jhabdas OK, thanks for your inputs.