• Home
  • Categories
  • Recent
  • Popular
  • Top
  • Tags
  • Users
  • Groups
  • Documentation
    • Home
    • Read API
    • Write API
    • Plugin Development
Skins
  • Light
  • Cerulean
  • Cosmo
  • Flatly
  • Journal
  • Litera
  • Lumen
  • Lux
  • Materia
  • Minty
  • Morph
  • Pulse
  • Sandstone
  • Simplex
  • Sketchy
  • Spacelab
  • United
  • Yeti
  • Zephyr
  • Dark
  • Cyborg
  • Darkly
  • Quartz
  • Slate
  • Solar
  • Superhero
  • Vapor

  • Default (No Skin)
  • No Skin
Collapse
v3.5.1 Latest
Buy Hosting

Trouble updating from 0.7.2 to 0.7.3

Scheduled Pinned Locked Moved Technical Support
3 Posts 2 Posters 1.3k Views
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • PilvinenP Offline
    PilvinenP Offline
    Pilvinen
    wrote on last edited by Pilvinen
    #1

    When trying to update Nodebb from 0.7.2 to 0.7.3 with "git pull" I'm getting: "Pull is not possible because you have unmerged files."

    I'm not expert with git (never used it before, actually). So what now?

    EDIT: Okay, I guess it's updated now. I did some merging and pulling and adding new files and ... I have no idea what I did but it didn't crash and it's now saying 0.7.3 so I guess it's fine.

    Better instructions in the docs, please? 🙂

    1 Reply Last reply
    0
  • julianJ Offline
    julianJ Offline
    julian GNU/Linux
    wrote on last edited by
    #2

    The unmerged files error suggests some files in core were modified by you, so git did not know how to proceed.

    Our advice is to not modify core files, for this exact reason 🙂

    1 Reply Last reply
    0
  • PilvinenP Offline
    PilvinenP Offline
    Pilvinen
    wrote on last edited by Pilvinen
    #3

    @julian but the point is that I haven't modified any of those files. Most of the files were text files like for example: README.md, LICENSE, etc.

    Why would I modify any of those?

    I have:

    1. Installed Nodebb
    2. Installed plugins
    3. Tweaked settings in admin control panel
    4. Tried to update to 0.7.3 -> got errors

    Actually I got help from Nodebbs IRC- channel on how to resolve these errors with git and I'm now running 0.7.3. but it was not easy, I've no experience with git and no idea why I have to deal with stuff like this when updating.

    1 Reply Last reply
    0

Copyright © 2023 NodeBB | Contributors
  • Login

  • Don't have an account? Register

  • Login or register to search.
Powered by NodeBB Contributors
  • First post
    Last post
0
  • Home
  • Categories
  • Recent
  • Popular
  • Top
  • Tags
  • Users
  • Groups
  • Documentation
    • Home
    • Read API
    • Write API
    • Plugin Development