Revision history  [back]

Saman virheen sain minäkin:

kestosippi@lakka:~/acme-tiny$ git pull
 remote: Counting objects: 9, done.
 remote: Compressing objects: 100% (3/3), done.
 remote: Total 9 (delta 6), reused 9 (delta 6), pack-reused 0
 Unpacking objects: 100% (9/9), done.
 From https://github.com/diafygi/acme-tiny
    7ef9164..4ed1395  master     -> origin/master
    7ef9164..4ed1395  travis-ci  -> origin/travis-ci
 Updating 7ef9164..4ed1395
 error: Your local changes to the following files would be overwritten by merge:
     acme_tiny.py
 Please, commit your changes or stash them before you can merge.
Aborting