0

I have using mercurial version control for my project. Now I want to merge source from branch A to branch B.

And my questions are:

  • Is there any way to ignore some folder when merging source?
  • Or is there any way can I specify a folder to merge?

I searched Google for my issue but only find how to ignore files.

Can anyone help me in this issue? Thanks you so much

4

1 回答 1

0

听起来您正在项目中创建一个文件夹。一种选择是在文件中添加文件夹以.hgrc在合并期间始终使用本地文件

[merge-patterns]
path/to/folder/* = internal:local
于 2015-05-18T03:57:56.597 回答