《咒》这个电影以一个道士的身份看，了解到了什么？
首先了解一下这个电影的内容来源，我翻阅了资料如下： 
解决 Git 更新本地冲突：commit your changes or stash them before you can merge
当git pull命令发出后，出现了下面的问题 ``` error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.java Please, commit your changes or stash them before you can merge.