Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

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

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.

like image 862
Marcus Leon Avatar asked Jan 31 '11 14:01

Marcus Leon


2 Answers

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).

like image 52
Zoë Peterson Avatar answered Oct 04 '22 17:10

Zoë Peterson


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.

like image 36
John Avatar answered Oct 04 '22 19:10

John