git提交js文件报错

0 files committed, 5 files failed to commit: Merge branch 'dinglishi-dev' 问题件查询 # Conflicts: # src/services/express.js husky > npm run -s precommit (node v9.5.0) [?25lRunning tasks for **/*.{js,jsx} [started] Running tasks for **/*.less [started] lint-staged:js [started] stylelint --syntax less [started] stylelint --syntax less [failed] → × stylelint --syntax less found some errors. Please fix them and try committing again. src/routes/Express/appproblemparts/index.less 1:1 × Unexpected empty source no-empty-source Running tasks for **/*.less [failed] → × stylelint --syntax less found some errors. Please fix them and try committing again. src/routes/Express/appproblemparts/index.less 1:1 × Unexpected empty source no-empty-source lint-staged:js [failed] → × lint-staged:js found some errors. Please fix them and try committing again. C:\Users\Administrator\IdeaProjects\ksg-ui\src\services\express.js 1:33 error Strings must use singlequote quotes 2:21 error Strings must use singlequote quotes 3:10 error 'read' is defined but never used no-unused-vars 3:22 error Strings must use singlequote quotes 21:47 error Missing space before opening brace space-before-blocks 32:41 error A space is required after ',' comma-spacing 32:64 error A space is required after ',' comma-spacing 32:77 error A space is required before '}' object-curly-spacing 32:78 error Missing semicolon semi C:\Users\Administrator\IdeaProjects\ksg-ui\src\routes\Express\appproblemparts\index.js 1:25 error Strings must use singlequote quotes 2:23 error Strings must use singlequote quotes 3:10 error 'Divider' is defined but never used no-unused-vars 3:32 error 'Badge' is defined but never used no-unused-vars 3:39 error 'message' is defined but never used no-unused-vars 3:54 error Absolute imports should come before relative imports import/first 3:54 error Strings must use singlequote quotes 4:8 error 'styles' is defined but never used no-unused-vars 4:20 error Strings must use singlequote quotes 5:30 error Strings must use singlequote quotes 9:12 error Missing trailing comma comma-dangle 10:8 error Strings must use singlequote quotes 11:10 error 'confirm' is defined but never used no-unused-vars 11:25 error Strings must use singlequote quotes 12:10 error 'Link' is defined but never used no-unused-vars 12:22 error Absolute imports should come before relative imports import/first 12:22 error Strings must use singlequote quotes 14:19 error Strings must use singlequote quotes 16:26 error Missing trailing comma comma-dangle 25:7 error 'dispatch' is assigned a value but never used no-unused-vars 25:15 error Missing trailing comma comma-dangle 32:15 error Strings must use singlequote quotes 33:22 error Strings must use singlequote quotes 33:29 error Missing trailing comma comma-dangle 36:15 error Strings must use singlequote quotes 37:22 error Strings must use singlequote quotes 37:29 error Missing trailing comma comma-dangle 38:8 error Missing trailing comma comma-dangle 59:16 error Strings must use singlequote quotes 60:20 error Strings must use singlequote quotes 62:21 error Missing trailing comma comma-dangle 65:16 error Strings must use singlequote quotes 66:20 error Strings must use singlequote quotes 68:21 error Missing trailing comma comma-dangle 71:16 error Strings must use singlequote quotes 72:20 error Strings must use singlequote quotes 74:21 error Missing trailing comma comma-dangle 77:16 error Strings must use singlequote quotes 78:20 error Strings must use singlequote quotes 80:21 error Missing trailing comma comma-dangle 83:16 error Strings must use singlequote quotes 84:20 error Strings must use singlequote quotes 86:21 error Missing trailing comma comma-dangle 89:16 error Strings must use singlequote quotes 90:20 error Strings must use singlequote quotes 92:21 error Missing trailing comma comma-dangle 95:16 error Strings must use singlequote quotes 96:20 error Strings must use singlequote quotes 98:21 error Missing trailing comma comma-dangle 101:16 error Strings must use singlequote quotes 102:20 error Strings must use singlequote quotes 104:21 error Missing trailing comma comma-dangle 107:16 error Strings must use singlequote quotes 108:20 error Strings must use singlequote quotes 110:21 error Missing trailing comma comma-dangle 113:16 error Strings must use singlequote quotes 114:20 error Strings must use singlequote quotes 116:21 error Missing trailing comma comma-dangle 119:16 error Strings must use singlequote quotes 120:20 error Strings must use singlequote quotes 122:21 error Missing trailing comma comma-dangle 125:16 error Strings must use singlequote quotes 126:20 error Strings must use singlequote quotes 128:21 error Missing trailing comma comma-dangle 131:16 error Strings must use singlequote quotes 132:20 error Strings must use singlequote quotes 134:21 error Missing trailing comma comma-dangle 137:16 error Strings must use singlequote quotes 138:20 error Strings must use singlequote quotes 140:21 error Missing trailing comma comma-dangle 143:16 error Strings must use singlequote quotes 144:20 error Strings must use singlequote quotes 146:21 error Missing trailing comma comma-dangle 149:16 error Strings must use singlequote quotes 150:20 error Strings must use singlequote quotes 152:21 error Missing trailing comma comma-dangle 155:16 error Strings must use singlequote ...

发现时一些文件的类型识别有冲突

进入目录  git bash之后执行下面的语句就可以了

git commit --no-verify -m "修改"

参考的文档

点击打开链接

http://blog.csdn.net/hudashi/article/details/7664409