超越比较合并 - 是否有“为所有人留下”？

Question

When we do merges with Beyond Compare there is a "Take Left" or "Take Right" option for each conflict.. is there any way to do a "Take Left for all conflicts"? I've seen this in other merge tools (Kidff3 has it) but I can't see it in Beyond Compare.

Answer 1

将显示过滤器更改为Show Conflicts （View-> Show Conflicts），然后在其中一个输入窗格中使用Select All （Ctrl + A），然后选择 Take Left （ Ctrl + L ）或Take Right （ Ctrl + R ）。

Answer 2

To follow up on what Craig said, Beyond Compare version 3 operates slightly differently. View->Show Conflicts is now View->Show Context .

Also,

• Take Left is now Copy to Left ( Ctrl + L )
• Take Right is now Copy to Right ( Ctrl + R )

The two mentioned points could be vexing for someone who reads this with V3, because Take and Copy could be seen as opposites.