From b2b3723fd568e9e8ea19696d1ec7fcc025ee8696 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 May 2014 16:17:25 -0400 Subject: [PATCH] updated instructions for upgrading nodebb --- docs/upgrading/index.rst | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/upgrading/index.rst b/docs/upgrading/index.rst index 00b5d36d50..d9078640f5 100644 --- a/docs/upgrading/index.rst +++ b/docs/upgrading/index.rst @@ -108,16 +108,15 @@ Navigate to your NodeBB: ``$ cd /path/to/nodebb``. If you are upgrading from a lower branch to a higher branch, switch branches as necessary. ***Make sure you are completely up-to-date on your current branch!***. -For example, if upgrading from ``v0.1.4`` to ``v0.2.0``: +For example, if upgrading from ``v0.3.2` to ``v0.4.3``: .. code:: bash - $ git fetch # Grab the latest code from your current branch - $ git checkout v0.2.x + $ git fetch # Grab the latest code from the NodeBB Repository + $ git checkout v0.4.x # Type this as-is! Not v0.4.2 or v0.4.3, but "v0.4.x"! + $ git merge origin/v0.4.x -If not upgrading between branches, skip the commands above. - -Then, grab the latest code: +If not upgrading between branches, just run the following command: .. code:: bash @@ -145,4 +144,4 @@ This script will install any missing dependencies, upgrade any plugins or themes 6. Start up NodeBB & Test! ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -You should now be running the latest version of NodeBB. \ No newline at end of file +You should now be running the latest version of NodeBB.