error: Your local changes to the following files would be overwritten by merge: src/main/java/com/citi/fowb/domain/distribution/DistributionCalendar.java
git pull出现此问题:
1.如果该文件自己没有改动,执行命令git restore src/main/java/com/citi/fowb/domain/distribution/DistributionCalendar.java
2.如果该文件自己改动,先git commit,后git pull
error: Your local changes to the following files would be overwritten by merge:
最新推荐文章于 2023-08-24 10:27:32 发布