简体繁体 English

如何使用Git摆脱Master Branch中的Merge评论？

[英]How to get rid of Merge Comments in the Master Branch with Git?

原文 2014-01-17 11:45:39 0 1 javascript/ git/ version-control/ github/ github-for-windows

I tried merging Develop Branch into master and now getting Errors while Smoke Testing. 我尝试将Develop Branch合并为master ，现在在Smoke Testing中出现错误。

This is driving me crazy. 这真让我抓狂。 Things like 像

>>>>>>>>>>>>> HEAD >>>>>>>>>>>>> HEAD

>>>>>>>>>>>>> Develop >>>>>>>>>>>>>开发

AND 和

======= =======

are appearing in the code Which are creating a havoc while even deploying. 出现在代码中甚至在部署时会造成严重破坏。

How do I get rid of these comments and Github headers. 我如何摆脱这些评论和Github标题。 My Develop branch is still intact and working fine. 我的开发分支仍然完好无损，工作正常。 The Master branch is driving me merge and pull etc etc to no rescue, Please help. 主分支驾驶我合并拉等等没有救援，请帮忙。 Thanks in advance. 提前致谢。 Smoke Testing in Smokes. 烟雾中的烟雾测试。

It's all Javascript btw. 这都是Javascript btw。

1 个解决方案

Those are not comments, those are merge conflicts that happened because you tried to merge a part of a file that was edited differently in those two branches. 这些不是注释，这些是因为您尝试合并在这两个分支中以不同方式编辑的文件的一部分而发生的合并冲突。

Since you are using git, you should read a little about it and its merging tool, and fix the file properly before deploying. 由于您使用的是git，因此您应该阅读一下它及其合并工具，并在部署之前正确修复文件。 Try to read about merge conflicts in the git documentation: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging 尝试阅读git文档中的合并冲突： http ： //git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging