The working copy "Test" failed to commit files.问题解决

本文介绍了一种在替换图片资源时出现的冲突现象及其解决办法。冲突来源于新旧图片资源的不一致,解决方法为删除原有资源后再重新添加。

1、产生来源及现象

  • 1.1 来源:往图片资源中替换旧图片资源,导致与原来的图片产生冲突。

    1213778-20180813185545392-363247126.png
  • 1.2 原因分析

    1213778-20180813185612828-1083103241.png

2、解决办法

  • 删了重新加一下就可以提交了

    1213778-20180813185731366-2147215222.png

转载于:https://www.cnblogs.com/CH520/p/9470232.html

warning: in the working copy of '.gitignore', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AppScope/resources/base/media/layered_image.json', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'code-linter.json5', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/.gitignore', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/hvigorfile.ts', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/obfuscation-rules.txt', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/main/ets/pages/Login.ets', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/main/resources/base/element/string.json', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/main/resources/base/media/layered_image.json', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/main/resources/base/profile/main_pages.json', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/mock/mock-config.json5', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/ohosTest/ets/test/Ability.test.ets', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/ohosTest/ets/test/List.test.ets', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/test/List.test.ets', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'entry/src/test/LocalUnit.test.ets', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'hvigorfile.ts', LF will be replaced by CRLF the next time Git touches it error: 'inventory-system/' does not have a commit checked out fatal: adding files failed
最新发布
09-18
10:58:59.489: [AiWord] git -c core.quotepath=false -c log.showSignature=false rm --ignore-unmatch --cached -r -- src 11:00:04.948: [AiWord] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -A -- AiWord-service/src/main/java/com/rc/aiwordservice/AiWordServiceApplication.java AiWord-service/mvnw AiWord-service/src/test/java/com/rc/aiwordservice/AiWordServiceApplicationTests.java AiWord-pojo/src/test/java/com/rc/aiwordpojo/AiWordPojoApplicationTests.java AiWord-pojo/mvnw.cmd AiWord-pojo/.mvn/wrapper/maven-wrapper.properties AiWord-service/.gitattributes AiWord-service/.mvn/wrapper/maven-wrapper.properties AiWord-service/.gitignore AiWord-service/mvnw.cmd AiWord-common/mvnw.cmd AiWord-common/src/main/resources/application.properties AiWord-pojo/.gitattributes AiWord-service/pom.xml AiWord-common/.mvn/wrapper/maven-wrapper.properties AiWord-pojo/.gitignore AiWord-pojo/mvnw AiWord-pojo/pom.xml AiWord-common/src/test/java/com/rc/aiwordcommon/AiWordCommonApplicationTests.java AiWord-common/.gitattributes AiWord-common/.gitignore AiWord-common/mvnw AiWord-common/pom.xml AiWord-pojo/src/main/resources/application.properties AiWord-service/src/main/resources/application.properties warning: in the working copy of 'AiWord-common/.gitattributes', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-common/.gitignore', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-common/.mvn/wrapper/maven-wrapper.properties', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-common/mvnw.cmd', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-common/pom.xml', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-common/src/main/resources/application.properties', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-common/src/test/java/com/rc/aiwordcommon/AiWordCommonApplicationTests.java', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-pojo/.gitattributes', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-pojo/.gitignore', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-pojo/.mvn/wrapper/maven-wrapper.properties', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-pojo/mvnw.cmd', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-pojo/pom.xml', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-pojo/src/main/resources/application.properties', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-pojo/src/test/java/com/rc/aiwordpojo/AiWordPojoApplicationTests.java', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-service/.gitattributes', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-service/.gitignore', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-service/.mvn/wrapper/maven-wrapper.properties', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-service/mvnw.cmd', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-service/pom.xml', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-service/src/main/java/com/rc/aiwordservice/AiWordServiceApplication.java', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-service/src/main/resources/application.properties', LF will be replaced by CRLF the next time Git touches it warning: in the working copy of 'AiWord-service/src/test/java/com/rc/aiwordservice/AiWordServiceApplicationTests.java', LF will be replaced by CRLF the next time Git touches it 11:00:06.129: [AiWord] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -A -f -- AiWord-service/src/main/java/com/rc/aiwordservice/AiWordServiceApplication.java AiWord-service/mvnw .gitignore mvnw.cmd AiWord-service/src/test/java/com/rc/aiwordservice/AiWordServiceApplicationTests.java AiWord-pojo/src/test/java/com/rc/aiwordpojo/AiWordPojoApplicationTests.java AiWord-pojo/mvnw.cmd AiWord-pojo/.mvn/wrapper/maven-wrapper.properties AiWord-service/.gitattributes AiWord-service/.mvn/wrapper/maven-wrapper.properties AiWord-service/.gitignore AiWord-service/mvnw.cmd AiWord-common/mvnw.cmd AiWord-common/src/main/resources/application.properties .mvn/wrapper/maven-wrapper.properties AiWord-pojo/.gitattributes AiWord-service/pom.xml AiWord-common/.mvn/wrapper/maven-wrapper.properties AiWord-pojo/.gitignore AiWord-pojo/mvnw AiWord-pojo/pom.xml AiWord-common/src/test/java/com/rc/aiwordcommon/AiWordCommonApplicationTests.java .gitattributes pom.xml AiWord-common/.gitattributes AiWord-common/mvnw AiWord-common/.gitignore AiWord-common/pom.xml mvnw AiWord-pojo/src/main/resources/application.properties AiWord-service/src/main/resources/application.properties warning: in the working copy of 'pom.xml', LF will be replaced by CRLF the next time Git touches it 11:00:06.229: [AiWord] git -c core.quotepath=false -c log.showSignature=false commit -F C:\Users\冯炜\AppData\Local\Temp\git-commit-msg-.txt -- [master (root-commit) 5880575] AiWord项目框架 31 files changed, 2173 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 AiWord-common/.gitattributes create mode 100644 AiWord-common/.gitignore create mode 100644 AiWord-common/.mvn/wrapper/maven-wrapper.properties create mode 100644 AiWord-common/mvnw create mode 100644 AiWord-common/mvnw.cmd create mode 100644 AiWord-common/pom.xml create mode 100644 AiWord-common/src/main/resources/application.properties create mode 100644 AiWord-common/src/test/java/com/rc/aiwordcommon/AiWordCommonApplicationTests.java create mode 100644 AiWord-pojo/.gitattributes create mode 100644 AiWord-pojo/.gitignore create mode 100644 AiWord-pojo/.mvn/wrapper/maven-wrapper.properties create mode 100644 AiWord-pojo/mvnw create mode 100644 AiWord-pojo/mvnw.cmd create mode 100644 AiWord-pojo/pom.xml create mode 100644 AiWord-pojo/src/main/resources/application.properties create mode 100644 AiWord-pojo/src/test/java/com/rc/aiwordpojo/AiWordPojoApplicationTests.java create mode 100644 AiWord-service/.gitattributes create mode 100644 AiWord-service/.gitignore create mode 100644 AiWord-service/.mvn/wrapper/maven-wrapper.properties create mode 100644 AiWord-service/mvnw create mode 100644 AiWord-service/mvnw.cmd create mode 100644 AiWord-service/pom.xml create mode 100644 AiWord-service/src/main/java/com/rc/aiwordservice/AiWordServiceApplication.java create mode 100644 AiWord-service/src/main/resources/application.properties create mode 100644 AiWord-service/src/test/java/com/rc/aiwordservice/AiWordServiceApplicationTests.java create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml 11:02:01.715: [AiWord] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/master:refs/heads/master --set-upstream error: failed to push some refs to 'https://gitee.com/fengweifff/ai-word.git' To https://gitee.com/fengweifff/ai-word.git hint: Updates were rejected because the remote contains work that you do not ! refs/heads/master:refs/heads/master [rejected] (fetch first) hint: have locally. This is usually caused by another repository pushing to Done hint: the same ref. If you want to integrate the remote changes, use hint: 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
08-30
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值