我运行了以下命令
$ bundle exec rake test
$ git add -A
$ git commit -m "Finish layout and routes"
$ git checkout master
$ git merge filling-in-layout
在运行最后一个"merge“命令后,它抛出以下错误:
error: Your local changes to the following files would be overwritten by checkout:
spring/50c4ccb1d8f630979e84c0