さて変更を反映するか。 $ git pull remote: Counting objects: 74, done. remote: Compressing objects: 100% (37/37), done. remote: Total 60 (delta 26), reused 55 (delta 21) Unpacking objects: 100% (60/60), done. From xxxxxxxxxx xxxxxx..xxxxxx master -> origin/master Updating xxxxxx..xxxxxx error: Your local changes to 'xxxxxxxxxx' would be overwritten by merge. Aborting. Please, commit your changes or stash them