$ cd ~/workspace/blog/themes/biture/ $ git pull remote: Counting objects: 22, done. remote: Compressing objects: 100% (20/20), done. remote: Total 22 (delta 8), reused 11 (delta 2) Unpacking objects: 100% (22/22), done. From git://github.com/kywk/hexo-theme-biture c5ff02c..a570845 master -> origin/master + b95d803...e903ea6 hexi-kywk -> origin/hexi-kywk (forced update) Updating c5ff02c..a570845 error: Your local changes to the following files would be overwritten by merge: layout/_partial/article.ejs source/css/biture.css Please, commit your changes or stash them before you can merge. Aborting