Question

我有一个名为editinfopage的分支。

我已经使用命令将分支与master合并：

git checkout master
git pull origin master
git merge editinfopage

然后我收到此错误：

> Auto-merging routes/users.js
>     CONFLICT (content): Merge conflict in routes/users.js
>     Auto-merging models/user.js
>     CONFLICT (content): Merge conflict in models/user.js
>     Auto-merging frontend/src/services/auth.service.ts
>     CONFLICT (content): Merge conflict in frontend/src/services/auth.service.ts
>     Auto-merging frontend/src/pages/register/register.ts
>     Auto-merging frontend/src/pages/login/login.ts
>     CONFLICT (content): Merge conflict in frontend/src/pages/login/login.ts
>     Auto-merging frontend/src/pages/editinfo/editinfo.ts
>     CONFLICT (content): Merge conflict in frontend/src/pages/editinfo/editinfo.ts
>     Auto-merging frontend/src/pages/editinfo/editinfo.scss
>     CONFLICT (content): Merge conflict in frontend/src/pages/editinfo/editinfo.scss
>     Auto-merging frontend/src/app/app.module.ts
>     CONFLICT (content): Merge conflict in frontend/src/app/app.module.ts
>     Auto-merging frontend/package.json
>     CONFLICT (content): Merge conflict in frontend/package.json
>     Auto-merging frontend/config.xml
>     CONFLICT (content): Merge conflict in frontend/config.xml
>     Removing frontend/back-end/server.js
>     Removing frontend/back-end/routes/routes.js
>     Removing frontend/back-end/package.json
>     Removing frontend/back-end/package-lock.json
>     Removing frontend/back-end/models/contacts.js
>     Automatic merge failed; fix conflicts and then commit the result.`

我该如何解决这个问题？

Answer 1

输出是不言自明的。您有合并冲突。您需要修复所有这些。配置您选择的任何合并工具并执行-

git mergetool

此命令将打开您配置的合并工具，您可以在其中选择要保留的本地更改和远程更改。完成所有文件后，您将必须将它们作为合并提交来提交。

我个人最喜欢的合并工具是融合。从互联网下载它，并使用-设置为全局git配置。

git config --global merge.tool meld

无法将分支与github中的master合并

1 个答案: