Announcement

Collapse
No announcement yet.

How to add lines from both sources in a 3-way merge

Collapse
X
 
  • Filter
  • Time
  • Show
Clear All
new posts

  • Aaron
    replied
    Hello,

    In the Edit menu -> we have Take Left then Right and also Take Right then Left. They aren't on the toolbar, but can have hotkeys assigned to them.

    Leave a comment:


  • JeanLibera
    started a topic How to add lines from both sources in a 3-way merge

    How to add lines from both sources in a 3-way merge

    When I do a 3-way merge, sometimes I would like to add text from both sources, but it seems like I have to pick one or the other for each merge conflict. I know that I can pick one source and then copy-paste in the text from the other source, but is there a way to avoid copy-paste by clicking both arrows in the merge window?
Working...
X