Skip to content

Developer

The Cure for Merge Madness

  • catlan 
  • 5 min read

Following the addition of Git File History in Kaleidoscope 4.1, in this latest update we wanted to tackle merge conflicts by adding more context provided by Git. New tools enable you to understand conflicts better and thus resolve them faster.

Kaleidoscope 4.1 and Git

  • Florian 
  • 6 min read

With the first major update to Kaleidoscope 4, we are entering completely new territory: Kaleidoscope can now directly talk to Git. While Kaleidoscope could always integrate with Git, until now it could only show the results of a Git operation, such as git difftool and git mergetool, which was typically initiated through a Git client like Tower. For the 4.1 update, we decided to focus on the ability to display and compare multiple revisions of a file.

Code Review of Feature Branches

  • catlan 
  • 4 min read

A common workflow in Git is to use feature branches, where work is focused on one specific task. The Changeset functionality in Kaleidoscope helps you see exactly what has been done in a feature branch.

Mac App Store and investing engineering time

  • catlan 
  • 5 min read

Today I’d like to share some insight in what I consider a mistake I made in investing our engineering time. Running a business is hard, and there aren’t always perfect solutions or ideal situations.

Kaleidoscope Developer Tools for Safari, Part 2

  • Florian 
  • 6 min read

As announced last week in Part 1 of our article focusing on JavaScript debugging, this second part shows how to take advantage of Kaleidoscope Developer Tools for Safari when working on web page content and layout.

New Extension: Kaleidoscope Developer Tools for Safari

  • catlan 
  • 5 min read

We are thrilled to bring you our new Safari Extension for Web Developers. It offers 4 distinct features to cover your development needs. In this article, we will focus on the more advanced usage, ksdiff for the Safari JavaScript Console.