Results 1 to 2 of 2
  1. #1
    Join Date
    May 2014
    Posts
    3

    Question 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?

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,618

    Default

    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.
    Aaron P Scooter Software

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •