diff --git a/docs/getting-started/syncing.md b/docs/getting-started/syncing.md index 4d1373609..4eca8164d 100644 --- a/docs/getting-started/syncing.md +++ b/docs/getting-started/syncing.md @@ -81,6 +81,9 @@ Push the changes back to your origin feature branch: git push origin ``` +After you've fetched new commits from upstream, run `./bin/setup`, and it will +install new gems, npm packages, update database, and restart Rails server. + ## Additional resources - [Syncing a fork](https://help.github.com/articles/syncing-a-fork/) diff --git a/docs/getting-started/workflow.md b/docs/getting-started/workflow.md index d4c403357..7f6e92c1e 100644 --- a/docs/getting-started/workflow.md +++ b/docs/getting-started/workflow.md @@ -31,6 +31,11 @@ Use this: - to sync with latest changes from upsteam master before continuing with a new feature on your current branch +After you've fetched new commits from upstream, run `./bin/setup`, and it will +install new gems, npm packages, update database, and restart Rails server. + +Start the app by running `./bin/startup`, if it's not already running. + ## Start over / discard all your changes Sometimes it is neccesarry to start over from the beginning or reset the current @@ -43,3 +48,8 @@ Use this: - before working on a new feature - before creating a new branch to make sure to have all the latest changes in your fork also. + +After you've done that, run `./bin/setup`, and it will update gems, npm +packages, update database, and restart Rails server. + +Start the app by running `./bin/startup`, if it's not already running.