Trouble updating from 0.7.2 to 0.7.3
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?
Why would I modify any of those?
- Installed Nodebb
- Installed plugins
- Tweaked settings in admin control panel
- 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.