Merging branches should always take place in a working folder.

• 合并分支应该始终在一个工作目录中进行。