git合并分支时如何解决冲突

合并时有冲突 

$ git merge --no-ff modifyGR
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
 

 输入git status查找冲突原因

 

$ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

        modified:   src/main/resources/publisher/site/conf/locales/js/i18nResources_zh-CN.json
        modified:   src/main/resources/publisher/site/themes/wso2/templates/stats/faulty-invocations/js/stats.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   src/main/resources/publisher/site/themes/wso2/templates/stats/api-usage-user/js/stats.js
 

找到 /stats.js文件并修改完成后，添加该文件

$ git add src/main/resources/publisher/site/themes/wso2/templates/stats/api-usage-user/js/stats.js

完成后 输入git status进行查看

$ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

Changes to be committed:

        modified:   src/main/resources/publisher/site/conf/locales/js/i18nResources_zh-CN.json
        modified:   src/main/resources/publisher/site/themes/wso2/templates/stats/api-usage-user/js/stats.js
        modified:   src/main/resources/publisher/site/themes/wso2/templates/stats/faulty-invocations/js/stats.js
 

没有问题提交这次冲突，然后进行合并，push完成。

 $ git commit -m "修改API订阅中的合并冲突"
[develop f8b84a5] 修改API订阅中的合并冲突

$ git merge --no-ff modifyGR
Already up-to-date.