I'm receiving a couple of these emails daily, given that I do not have a GitHub account could someone give me an hint about what's wrong with them?
Hi,
There has been a merge failure on Minetest/Minetest at Hosted Weblate.
Error message:
Auto-merging src/guiFormSpecMenu.cpp
CONFLICT (content): Merge conflict in src/guiFormSpecMenu.cpp
Automatic merge failed; fix conflicts and then commit the result. (1)
Repository status:
On branch master
Your branch and 'origin/master' have diverged,
and have 31 and 9 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
Changes to be committed:
modified: builtin/mainmenu/tab_credits.lua
modified: doc/lua_api.txt
modified: src/chat.cpp
modified: src/client/tile.cpp
modified: src/defaultsettings.cpp
modified: src/server.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/guiFormSpecMenu.cpp
Repository with Weblate translations:
git://git.weblate.org/minetest.git
Check our FAQ for information how to resolve this.
http://docs.weblate.org/en/latest/faq.html#merge
--
Sent by Weblate translation system
https://hosted.weblate.org/
Change subscription settings: https://hosted.weblate.org/accounts/pro ... scriptions
Donate to Weblate at https://weblate.org/donate/