User Tools

Site Tools


Exception: Git command failed to perform periodic pull: From github.com:NYRDS/wiki-data * branch master -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 34c743c4fa116a4ed3339addffb367229534fadb. error: Your local changes to the following files would be overwritten by merge: pages/rpd/battle_mage.txt pages/rpd/boss.txt pages/rpd/rat_king_crown.txt Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 34c743c4fa116a4ed3339addffb367229534fadb output, run $ git reset --hard to recover.

Exception: Git command failed to perform periodic pull: From github.com:NYRDS/wiki-data * branch master -> FETCH_HEAD warning: fetch updated the current branch head. fast-forwarding your working tree from commit 34c743c4fa116a4ed3339addffb367229534fadb. error: Your local changes to the following files would be overwritten by merge: pages/rpd/battle_mage.txt pages/rpd/boss.txt pages/rpd/rat_king_crown.txt Please commit your changes or stash them before you merge. Aborting fatal: Cannot fast-forward your working tree. After making sure that you saved anything precious from $ git diff 34c743c4fa116a4ed3339addffb367229534fadb output, run $ git reset --hard to recover.

An unforeseen error has occured. This is most likely a bug somewhere. It might be a problem in the gitbacked plugin.

More info has been written to the DokuWiki error log.