From https://bitbucket.org/sagatuku0012/sagatuku
* branch master -> FETCH_HEAD
= [up to date] master -> origin/master
error: The following untracked working tree files would be overwritten by merge:
game_data/event/大森林_小屋屋内.txt
Please move or remove them before you can merge.
Aborting
gitは正常に終了しませんでした (終了コード 128) (7656 ms @ 2015/07/04 19:46:00)
POST git-upload-pack (945 bytes)
remote: Counting objects: 18, done.
remote: Compressing objects: 100% (18/18), done.
remote: Total 18 (delta 12), reused 0 (delta 0)
From https://bitbucket.org/sagatuku0012/sagatuku
* branch master -> FETCH_HEAD
c21672a..a70e2a8 master -> origin/master
Updating c21672a..a70e2a8
error: The following untracked working tree files would be overwritten by merge:
game_data/event/荒野_フロア4.txt
game_data/map/荒野/フロア4.txt
Please move or remove them before you can merge.
Aborting