Updating NodeBB (git error re: local changes)

Phate

Thanks a heap for the reply.... Im stuck tho lol... sorry

At the git pull command...

I get: Updating 072d287..8944856
error: Your local changes to the following files would be overwritten by merge:
.
.
etc
Aborting

Any ideas? Cheers

Phate

@exodo
@scottalanmiller

For some

Just tried running them all together as you had written out.... Total newb didn't realise I could run command together like that....

Still no joy... Stuck on v0.7.1-dev

? Offline

@Phate why don't you just save your user avatars and uploads and then remove NodeBB completely, so you can perform a fresh upgrade. The database won't be touched anyway, when removing the current NodeBB files.

julian

@Phate You have some files that you have modified, that also happen to be tracked by git.

Do you remember which files those are? Are they important? Run git status to see which files are considered "modified".

Don't want those changes? git checkout path/to/file
Want those changes? git stash will temporarily save your changes, so you can upgrade, and then you can git stash pop to reapply them. Read more about it here

Phate

@julian

Thanks so much....

This worked....

The only thing that I lost was the user avatars that used to be generated by their email... Its know a solid colour with the first letter of their name..... The posts didn't change the avatars tho hhhmmmm

I can probably live with this lol

Thanks again

psychobunny

Hey, you can install the gravatar plugin to reclaim those original images

Phate

@psychobunny said:

Hey, you can install the gravatar plugin to reclaim those original images

Thanks... I couldn't remember what plugin was called......

There is now two of the gravatar plugins... Tried the first no go... Will give the other a try when I have time.

Thanks again.