sprouted_pixel_dungeon

Set new password

Please enter a new password for your account in this wiki.

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 8caa86f405da83af1e7bfc27edd5e5b2207e8655. error: Your local changes to the following files would be overwritten by merge: pages/rpd/chaos_set.txt pages/rpd/cold_spirit.txt pages/rpd/mercenarynpc.txt pages/rpd/shields.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 8caa86f405da83af1e7bfc27edd5e5b2207e8655 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 8caa86f405da83af1e7bfc27edd5e5b2207e8655. error: Your local changes to the following files would be overwritten by merge: pages/rpd/chaos_set.txt pages/rpd/cold_spirit.txt pages/rpd/mercenarynpc.txt pages/rpd/shields.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 8caa86f405da83af1e7bfc27edd5e5b2207e8655 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.