Text Merging
Kaleidoscope can help you merge the text differences in your files.
Select the change and choose to Copy A to B or Copy B to A using the arrow keys at the bottom of your window.
You can choose to keep both or none by selecting from the Merge menu item or by using the Option key while pressing the merge buttons.
To cancel out, you can simply Undo or close your comparison.
If you have any changes, just save the document like you normally would using a Save dialog.
Version Control Merging
Kaleidoscope can help you merge text files that may have been conflicted in your version control system. Be sure you have set Kaleidoscope as your mergetool via the Integration menu for your source control management system:
Go to Kaleidoscope > Integration…
Resolve Conflicts
Use ksdiff to send your merge conflicts to Kaleidoscope.
Interactive Conflict Resolution
Git and Mercurial offer an interactive way to resolve your VCS merge conflicts.
Send to Kaleidoscope via your ksdiff settings Review differences.Choose which to keep using the text merging tools.Save your changes by closing the comparison.Review your next conflicts.Finish up and confirm your changes in the Terminal.
Non-Interactive Conflict Resolution
You can send your Subversion and Bazaar conflicts to Kaleidoscope with the command line via ksdiff.
Send to Kaleidoscope via your ksdiff settings.Review differences and merge any changes.Save your changes.Mark your files as resolved in your VCS tool.
New Merge from Comparison
Any text comparison can be transformed into a merge document. This is very convenient if you have two text files and want to create a third one, a mix between those two where you also want to manually edit in addition to picking from A and B.
Create a Merge from a Comparison
Use either method to create a new Merge from an existing comparison:
Select Merge > New Merge from Comparison
Select “New Merge from Comparison“ from either of the small arrow buttons in the bottom toolbar.
