Nyrds Wiki

User Tools

Site Tools

Trace:
wiki:test

Media Manager

Namespaces

Choose namespace

Media Files

Upload to [root]

Sorry, you don't have enough rights to upload files.

File

wiki/test.txt · Last modified: by 127.0.0.1
Òîï Ðàçðàáîòêà èãð
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 04b5ec53382fd98d0acf5d8bbe36b5ba2822153c. error: Your local changes to the following files would be overwritten by merge: pages/rpd/giant_rat_skull.txt pages/rpd/necropolis.txt pages/rpd/poison.txt pages/rpd/spiderservant.txt pages/rpd/yogsbrain.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 04b5ec53382fd98d0acf5d8bbe36b5ba2822153c 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 04b5ec53382fd98d0acf5d8bbe36b5ba2822153c. error: Your local changes to the following files would be overwritten by merge: pages/rpd/giant_rat_skull.txt pages/rpd/necropolis.txt pages/rpd/poison.txt pages/rpd/spiderservant.txt pages/rpd/yogsbrain.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 04b5ec53382fd98d0acf5d8bbe36b5ba2822153c 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.