jeekajoo, le 10/10/2013 à 19:19
Problème:
$ git pull
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 4), reused 2 (delta 0)
Unpacking objects: 100% (6/6), done.
From https://github.com/sebsauvage/Shaarli
  246e9b4..7b2186a  master     -> origin/master
Updating 246e9b4..7b2186a
error: Your local changes to the following files would be overwritten by merge:
       index.php
Please, commit your changes or stash them before you can merge.
Aborting

Solution:
$ git reset --hard FETCH_HEAD
(Permalink)