Beyond Compare merges - is there a "take left for all"?
Asked Answered
O

2

33

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.

Oliver answered 31/1, 2011 at 14:33 Comment(1)
Sorry, I didn't think through my answer completely so I deleted it. I don't believe there's a way to do it.Irk
A
44

Change the display filter to Show Conflicts (View->Show Conflicts), then in one of the input panes use Select All (Ctrl+A) followed by Take Left (Ctrl+L) or Take Right (Ctrl+R).

Appetency answered 31/1, 2011 at 15:51 Comment(0)
A
4

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.

Additory answered 6/6, 2011 at 21:22 Comment(1)
My comments were for v3. Beyond Compare 3 Pro has a dedicated merge interface that takes 3 input files (yours, mine, and a shared ancestor) and shows the automatically merged results in a fourth output panel. The commands you're referring to only appear in the 2-way compare, which you can use for merging, but it can't detect conflicts, handle the merge automatically, or tell you which side a change came from. That is how we document "merges" for v2 and v3 Standard, which don't support the full merge interface though.Natividadnativism

© 2022 - 2024 — McMap. All rights reserved.