我知道其他人问过这个问题，但我想了解它的含义。我还在学git。
我在分支sample-tests我做了以下事情：
git checkout master-I切换到主分支
git pull-我这样做是为了将所有远程代码拉到本地，这样我就有了一个更新的本地代码。
我看到这个：
`在分支主机上你的分支和"起源/主"已经分化，并且分别具有2个和40个不同的提交。(使用"git pull"将远程分支合并到您的分支中(
所有冲突都已修复，但您仍在合并。(使用"gitcommit"结束合并(
待提交的变更：
modified: .eslintrc.js
modified: README.md
modified: cypress.json
modified: cypress/integration/SaveFormTest.js
new file: cypress/integration/SaveFormTest_orig.js
modified: cypress/support/commands.js
new file: cypress_old.json
new file: cypress_original.json
modified: jest.config.js
modified: package.json
modified: src/App.tsx
modified: src/api/requests.js
modified: src/components/AddressInput/AddressInput.tsx
modified: src/components/AddressInput/constants.ts
modified: src/components/FileUpload/FileUpload.styles.tsx
modified: src/components/FileUpload/FileUpload.tsx
modified: src/components/FileUpload/FileUpload.types.ts
modified: src/components/FileUpload/constants.ts
new file: src/components/FileUpload/utility.ts
modified: src/components/FileUploadTile/FileUploadTile.js
modified: src/components/FileUploadTile/UploadButton/UploadButton.js
modified: src/components/FormFieldsGenerator/FormFieldsGenerator.styles.tsx
modified: src/components/FormFieldsGenerator/FormFieldsGenerator.tsx
modified: src/components/FormFieldsGenerator/FormFieldsGenerator.types.ts
modified: src/components/FormFieldsGenerator/constants.ts
modified: src/components/FormFieldsGenerator/utility.ts
modified: src/components/FormPageTemplate/FormPageTemplate.tsx
modified: src/components/FormPageTemplate/FormPageTemplate.types.ts
modified: src/components/FormPageTemplate/FormPageTemplate.validation.ts
new file: src/components/FormQuestionDialogue/helpers.ts
new file: src/components/InputFormatted/InputCurrency.tsx
new file: src/components/InputFormatted/InputFormatted.styles.tsx
new file: src/components/InputFormatted/InputFormatted.tsx
new file: src/components/InputFormatted/InputFormatted.types.ts
new file: src/components/InputFormatted/index.ts
new file: src/components/ResourceDropdown/ResourceDropdown.styles.tsx
new file: src/components/ResourceDropdown/ResourceDropdown.tsx
new file: src/components/ResourceDropdown/ResourceDropdown.types.ts
new file: src/components/ResourceDropdown/index.ts
modified: src/components/Table/Table.styles.tsx
modified: src/components/Table/Table.tsx
modified: src/components/Table/Table.types.ts
modified: src/components/TopPanel/TopPanel.js
deleted: src/components/TopPanel/TopPanel.test.js
modified: src/config/messages/en.js
modified: src/constants/constants.js
modified: src/constants/propTypes.ts
new file: src/containers/AgentResources/AgentResources.styles.tsx
new file: src/containers/AgentResources/AgentResources.tsx
new file: src/containers/AgentResources/index.ts
modified: src/containers/UserWidget/UserWidget.js
deleted: src/containers/UserWidget/UserWidget.test.js
modified: src/graphql/client.ts
deleted: src/graphql/errorLink.ts
deleted: src/graphql/httpLink.ts
new file: src/gra
未暂存以供提交的更改：(使用"git add…"更新将提交的内容((使用"gitcheckout--…"放弃工作目录中的更改(
modified: cypress.json
modified: cypress/support/commands.js`
这意味着什么：在分支主机上你的分支和"起源/主"已经分化，并且分别具有2个和40个不同的提交。
很明显，我在当地的master分支。这是否意味着我的本地主分支与远程主分支不同？
我应该这样做吗：
git add .
git commit -m "message".来解决这个问题？我还应该在我所在的当前主分支上执行此操作吗？
我解决了冲突，上演并尝试了承诺。然而，我认为提交没有通过，我认为是因为我得到了以下错误。这个错误在cypress.json中吗？更漂亮的书写发现了什么错误？
`renukalaurkar$gitcommit-m"解决错误"；
husky > pre-commit (node v12.14.1)
↓ Stashing changes... [skipped]
→ No partially staged files found...
❯ Running tasks...
❯ Running tasks for *.{js,json,css,md}
✖ prettier --write
git add
✖ prettier --write found some errors. Please fix them and try
committing again.
.eslintrc.js 48ms
README.md 89ms
cypress.json 8ms
cypress/integration/SaveFormTest.js 58ms
cypress/integration/SaveFormTest_orig.js 23ms
cypress/support/commands.js 20ms
cypress_original.json 5ms
jest.config.js 7ms
src/api/requests.js 28ms
src/components/FileUploadTile/FileUploadTile.js 22ms
src/components/FileUploadTile/UploadButton/UploadButton.js 15ms
src/components/TopPanel/TopPanel.js 37ms
src/config/messages/en.js 11ms
src/constants/constants.js 14ms
src/store/user/reducers.test.js 20ms
[error] cypress_old.json: SyntaxError: Unexpected token (1:7)
[error] > 1 | b0VIM 8.1��B^.�rrenukaalurkarRenukas-
MBP~renukaalurkar/Documents/cypress_tests_renuka/KW-Offers-
FE/cypress.jsonutf-8
[error] | ^
[error] 2 | U3210#"! Utpada������wE$������} "defau}}
"defaultCommandTimeout": 100000 },
"test_admin_pass":${TEST_ADMIN_PASS} "test_admin":${TEST_ADMIN},
"test_tc_pass":${TEST_TC_PASS}, "test_tc":${TEST_TC},
"test_pass":${TEST_PASS}, "test_user":${TEST_USER},
"password":${PASSWORD}, "user_name", "host":"https://app.kw-
offers.master.kw-offers-dev.com/", "env":{{
husky > pre-commit hook failed (add --no-verify to bypass)
Renukas-MacBook-Pro:KW-Offers-FE renukaalurkar$ git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
Renukas-MacBook-Pro:KW-Offers-FE renukaalurkar$
`
看起来您有2个本地提交和40个远程分支。Git试图解决差异，但失败了，所以现在一些文件中存在冲突。
我会检查这两个文件：
cypress.json
cypress/support/commands.js
解决你在那里发现的任何问题，然后将其搁置。之后CCD_ 7。