Zdravím, již dlouho používám Git pro aktualizaci Moodlu. Dneska se mi pořád dokola vypisuje tato chyba:
version.php: needs merge
version.php: needs merge
version.php: unmerged (6fb2b0f2d65d6befff85fb4d2e5eb23a6f88fb16)
version.php: unmerged (4a1b9c291afcc6119fc208355410333a6491745c)
version.php: unmerged (c0377ea542433ea943c7020c82c3a867fd4ee40f)
fatal: git-write-tree: error building trees
Cannot save the current index state
U version.php
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
version.php: needs merge
unable to refresh index
Netušíte, jak se toho zbavit?
