git警告error:Yourlocalchangestothefollowingfileswouldbeoverwrittenbymerge:

error: Your local changes to the following files would be overwritten by merge:

Please commit your changes or stash them before you merge.

这意味着需要先提交，然后才能通过比较判断文件是否冲突。