package.json after update to 1.7.1

mudmanc4

I run 'git status' after the update, this time it printed:

``
On branch v1.5.x
Your branch and 'origin/v1.5.x' have diverged,
and have 582 and 16 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")

Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)

deleted by us:   package.json

``

Here are the first few lines of package.json:

"name": "nodebb",
  "license": "GPL-3.0",
  "description": "NodeBB Forum",
  "version": "1.5.3",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",
    "url": "https://github.com/NodeBB/NodeBB/"
  },

What have I done lol

Of course, I cannot "git pull" due to unmerged conflicts, so ... ?

mudmanc4

I've reverted to a snapshot and all is fine.
No idea what I did, will deal with this at some other time.

PitaJ

You should really update NodeBB when you get a chance. Older versions have security risks that are fixed in latest.

mudmanc4

@pitaj said in package.json after update to 1.7.1:

You should really update NodeBB when you get a chance. Older versions have security risks that are fixed in latest.

I take snapshots before and after I make any changes.

After the update from 1.7.0 > 1.7.1 I ran git status, which prints the following now, and then, same thing:

On branch v1.5.x
Your branch and 'origin/v1.5.x' have diverged,
and have 578 and 16 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
You have unmerged paths.
  (fix conflicts and run "git commit")

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:   package.json

So I checked package.json, which contained what is shown in my previous post.

Since that time, I have reverted to the 1.7.0 snapshot, and updated to 1.7.1, however package.json shows:

  "name": "nodebb",
  "license": "GPL-3.0",
  "description": "NodeBB Forum",
  "version": "1.7.1",
  "homepage": "http://www.nodebb.org",
  "repository": {
    "type": "git",

Question would be where is the issue?
The frontend show 1.7.1

PitaJ

Wait so are there any actual problems you are having? If you just want to fix the git thing, you can run git fetch && git reset --hard origin/v1.7.x

mudmanc4

@pitaj said in package.json after update to 1.7.1:

Wait so are there any actual problems you are having? If you just want to fix the git thing, you can run git fetch && git reset --hard origin/v1.7.x

Yea, that is the only issue. And it does not seem to make a difference, still showing on branch 1.5

This is the output of git pull:

git pull
CONFLICT (modify/delete): package.json deleted in HEAD and modified in b1b02bda7e253e316cafc85c7ca9189c2b15f463. Version b1b02bda7e253e316cafc85c7ca9189c2b15f463 of package.json left in tree.
Automatic merge failed; fix conflicts and then commit the result.

PitaJ

Yeah so if you use git reset --hard origin/v1.7.x while still on the v1.5.x branch you're gonna have a hard time. You need to run git reset --hard origin/v1.5.x instead and then you should be able to upgrade to v1.7.x

mudmanc4

@pitaj said in package.json after update to 1.7.1:

Yeah so if you use git reset --hard origin/v1.7.x while still on the v1.5.x branch you're gonna have a hard time. You need to run git reset --hard origin/v1.5.x instead and then you should be able to upgrade to v1.7.x

Fair enough. Though how can the forum explain it's on 1.7.1, as well the package.json claim to be 1.7.1, yet git claims 1.5 ?

Background is I've had this install going since roughly ~ 0.6.x or less, been a while I don't remember, if that helps any I don't know

PitaJ

Because the reset will override anything locally. It overrides the contents of git, but not the name of the current branch

mudmanc4

@pitaj said in package.json after update to 1.7.1:

Because the reset will override anything locally. Git just thinks you've changed a bunch of files.

Ok, then by resetting back to 1.5.x, then I'll need to go up to 1.7.x again yes?
Suppose I don't understand how or why this suddenly happened.

PitaJ

The only thing I can think for why this would happen is that your local 1.5.x branch diverged from the one on Github. The only way that could happen AFAIK is that you made a local commit.

Anyways, you should be able to git checkout v1.7.x to upgrade.

mudmanc4

Done!

git status
On branch v1.7.x
Your branch is up-to-date with 'origin/v1.7.x'.

Still out there (which I'm not sure I care) since it's not an issue, is to how this happened.

At any rate, thanks for the help, it's much appreciated you took the time!