Nyrds Wiki

User Tools

Site Tools

Trace:
rpd:fan:neclydov

Media Manager

Namespaces

Choose namespace

Media Files

Search in wiki

File

ru:rpd:tiled_guide_new_map.png

    Date:
    2017/01/06 19:02
    Filename:
    tiled_guide_new_map.png
    Format:
    PNG
    Size:
    16KB
    Width:
    395
    Height:
    311
    References for:
    tiled
    ��� ���������� ���
    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 af685b13206eb911d68b7fde781db19e782d55e2. error: Your local changes to the following files would be overwritten by merge: pages/start.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 af685b13206eb911d68b7fde781db19e782d55e2 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 af685b13206eb911d68b7fde781db19e782d55e2. error: Your local changes to the following files would be overwritten by merge: pages/start.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 af685b13206eb911d68b7fde781db19e782d55e2 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.