Upgrade Error 1.17.2 to 1.18.1

[Sampo2910]

Upgrade error. Followed instructions here: https://docs.nodebb.org/configuring/upgrade/

But now i get this :

install/package.json: needs merge
src/socket.io/user/profile.js: needs merge
error: you need to resolve your current index first

Any ideas please folks

[Sampo2910]

error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

[PitaJ]

Oh boy those instructions look bad. I'll have to go fix them soon. What's the output of git status?

[Sampo2910]

@pitaj thx for reply

On branch v1.18.x
Your branch is up to date with 'origin/v1.18.x'.

You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)

Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: install/package.json
both modified: src/socket.io/user/profile.js

no changes added to commit (use "git add" and/or "git commit -a")

[Sampo2910]

Solved:

I used the git add for the two conflicts.

'git status' then said conflicts were fixed.

I then used git reset --hard origin/v1.18.x

then ./nodebb upgrade

And started the forum. All ok and now using 1.18.1

Thanks for a shove in right direction Could be right or wrong way but it's working

[Sampo2910]

I am starting to feel stupid....

Every time i try to upgrade using this link: https://docs.nodebb.org/configuring/upgrade/

ends in errors!

There is update 1.18.1 to 1.18.2 so not between branches.

I stop the forum. CD to my nodebb directory.

ON that page it clearly says

$ git fetch
$ git reset --hard origin/v1.12.x # Replace v1.12.x with the branch name!

I get a return of

fatal: ambiguous argument 'origin/v1.18.2x': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

[PitaJ]

@sampo2910 you should use v1.18.x not v1.18.2x

[Sampo2910]

@pitaj

OK thanks again. Sorted now.

Such a noob. Put its slowly getting easier

Appreciate the help.