How do I merge two snippets in kaleidoscope?

0

I have two text snippets that I want to use to build (merge into each other) a third snippet.

How do I use Kaleidoscope to do this? I know Kaleidoscope can merge two things together, because I use it to do my git merge resolutions.

enter image description here

So, in this example, I want to use kaleidoscope to build a third snippet from these two snippets that says:

b.
c.
d.
f.
g.
h.

Note the addition of the "."s and "h" and the removal of the vowels "a" and "e". Basically, I want to use the diff between the two snippets as a starting point to help build an arbitrary third snippet (just like I'd be able to during a merge).

The "unified" view is not a valid answer because it does not allow manual edits the way the merged view does when using kaleidoscope to resolve a merge conflict: This is not the answer

It needs to look like this (the middle pane is editable here): enter image description here

cmcculloh

Posted 2016-05-03T14:41:40.203

Reputation: 5 307

Answers

0

  1. Create 2 files (each with the contents of one of the snippets you want to merge)
  2. Open terminal
  3. Issue command:

    ksdiff --merge --output "snippet-new.txt" "snippet1.txt" "snippet2.txt"

  4. Edit in center pane to your heart's content

  5. Save and exit

enter image description here

cmcculloh

Posted 2016-05-03T14:41:40.203

Reputation: 5 307