How to use Kaleidoscope 2 with Git Tower?

git git-tower
Bouke picture Bouke · Nov 21, 2012 · Viewed 10.6k times · Source

Kaleidoscope 2 public beta was released this week and has gained merge functionality. Yay! However, the command-line usage is somewhat vague about the usage. I want to use Kaleidoscope together with Git Tower, how can I do that?

$ ksdiff --help
usage: ksdiff - send files to Kaleidoscope
command options:                        
  [--wait, -w | --no-wait]              whether to wait for the document to be
                                        closed in Kaleidoscope before exiting

FILE options:
  [--snapshot | --no-snapshot]          whether the file is temporary. this
                                        option will override the heuristics
                                        ksdiff would otherwise use to determine
                                        this state.

commands:
  --merge                               send a merge
                                        implies --wait
    --output OUTPUT                     use OUTPUT as the destination path for
                                        this merge. creates OUTPUT if it does
                                        not exist.
    [--base BASE]                       use BASE as the base content for this
                                        merge. can improve the quality of the
                                        default selections for some merges.
    FILE FILE                           the files to merge

Support docs for external merge tools from Git Tower

Answer

Dave Wood picture Dave Wood · Jan 23, 2013

If you're using the MAS version of Kaleidoscope, you must install the ksdiff tool manually in order for Tower to be able to launch Kaleidoscope.

Download it here http://www.kaleidoscopeapp.com/ksdiff2

Related questions

Github Push Error: RPC failed; result=22, HTTP code = 413

stupid issue with Github going on right now. I have a decent amount of changes (~120MB in size), when I attempt to push, this is what happens: error: RPC failed; result=22, HTTP code = 413 fatal: The remote end hung up unexpectedly …

Read More
Trouble setting up Tower with my GitHub Account - error: could not lock config file

I've been using the GitHub for Mac app but on the suggestion of a friend, decided to give Tower a shot since it can also handle Beanstalk accounts as well. After installing the trial and putting in my GitHub username …

Read More
How to resolve fatal: Authentication failed for git [bitbucket]

I have been facing issue when i fetch or pull in any client. i.e "Tower" and Sourcetree. Everything was going smoothly , i did just update macos into Mojave. But I always get Error details: fatal: Authentication failed for 'https://…

Read More