如果你有自己的更改，不要点击替换所有箭头。检查每一个替换ARROW，只点击那些你同意的。左边的窗口是MCC建议的更改。右窗口是一个编辑器，您可以按您的意愿添加或删除。如果有一个以上的文件有建议的更改，则会有一个文件列表在顶部，您可以在文件中来回移动。当您检查了所有想要的更改时，只要按下合并编辑器[X]，就会有一个文件。确认提示。使用源代码存档/修改控制系统/版本控制软件，以帮助防止此类事件。问候，Mysil
以上来自于百度翻译
以下为原文
Don't click the Replace All Arrow if you have your own changes.
Check each single replace arrrow, and click only those you agree with.
The Left window is MCC suggested changes. Righthand window is a editor, you may add or delete as you wish.
If there is more than one file with suggested changes, there will be a list of files on the top,
you may go forth and back among the files.
When you have checked all the changes you want, just crash the merge editor [X], there will be a confirmation prompt.
Use a source code archive / revision control system / version control software, to help protect against such events.
Regards,
Mysil
如果你有自己的更改，不要点击替换所有箭头。检查每一个替换ARROW，只点击那些你同意的。左边的窗口是MCC建议的更改。右窗口是一个编辑器，您可以按您的意愿添加或删除。如果有一个以上的文件有建议的更改，则会有一个文件列表在顶部，您可以在文件中来回移动。当您检查了所有想要的更改时，只要按下合并编辑器[X]，就会有一个文件。确认提示。使用源代码存档/修改控制系统/版本控制软件，以帮助防止此类事件。问候，Mysil
以上来自于百度翻译
以下为原文
Don't click the Replace All Arrow if you have your own changes.
Check each single replace arrrow, and click only those you agree with.
The Left window is MCC suggested changes. Righthand window is a editor, you may add or delete as you wish.
If there is more than one file with suggested changes, there will be a list of files on the top,
you may go forth and back among the files.
When you have checked all the changes you want, just crash the merge editor [X], there will be a confirmation prompt.
Use a source code archive / revision control system / version control software, to help protect against such events.
Regards,
Mysil
举报
