A note re: updating NodeBB

[julian]

A lot of you have been running into problems upgrading NodeBB, for one reason or another, and while I'm not entirely sure why, I did realise that I made a small mistake in the documentation.

Previously:

$ git fetch # Grab the latest code from your current branch
$ git checkout v0.2.x

If not upgrading between branches, skip the commands above.

Then, grab the latest code:

$ git pull

My mistake was assuming that after a git fetch, git checkout would bring you to the latest commit in that branch. Git doesn't work like this.

The documentation has been amended thusly:

$ 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, just run the following command:

$ git pull

In short, after checking out the proper branch, you have to merge in the latest changes using $ git merge origin/v0.4.x.

As we have very helpful users on this forum, I just wanted to take a minute and make sure everybody knew this as well

[trevor]

Thanks for the update on this.

[Giorgio Chiodi]

@trevor me?

[trevor]

@Giorgio-Chiodi said:

@trevor me?

The conversation regarding blockquotes has been forked and continued here:
https://community.nodebb.org/topic/1506/what-is-this-magic