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

在服务器改动之后,用sourcetree提交会产生冲突,解决办法:

猜你喜欢

转载自www.cnblogs.com/yangzailu/p/9804247.html