salut, je viens de test voila le retour :
git pull origin master
remote: Counting objects: 60, done.
remote: Compressing objects: 100% (50/50), done.
remote: Total 60 (delta 21), reused 0 (delta 0)
Unpacking objects: 100% (60/60), done.
From https://github.com/Magicalex/seedbox-manager
* branch master -> FETCH_HEAD
Updating d529030..1f5ea47
error: Your local changes to the following files would be overwritten by merge:
public/themes/default/template/header.html
Please, commit your changes or stash them before you can merge.
Aborting