Skip to main content


One of the beautiful things about Sublime Merge¹ (and git/diffs) is that you can see exactly what has changed in complex expected values in tests to ensure that you’re updating the tests without overlooking regressions.

(This is from the Markdown page loader tests in Kitten², as I’m refactoring to implement the upcoming breaking change in the stateful components API³ as it affects the generated code for stateful layout components in Markdown pages.)

¹ Which I always have running, full-screen on its own monitor.
² kitten.small-web.org
³ Currently experimental and undocumented but that should change once this breaking change is implemented.

#git #diff #unitTests #tape #SublimeMerge #Kitten #SmallWeb #web #dev #developerExperience

This entry was edited (1 day ago)
in reply to Aral Balkan

I do like SM but by the time I'd found it I'd already paid for Fork. I keep thinking I'm missing something from SM but RubyMine already does my conflict resolution nicely so I just potter along.

Is there anything you really love workflow-wise about SM?

in reply to Russell Garner

Hadn’t heard of Fork. Looks really nice. The major thing for me is the live and instantly updated diffs (which Fork seems to have also from the screenshots).

And it looks like Fork has a few things folks have been asking from the Sublime Merge team like interactive rebases. So I might actually give Fork a shot too ;)

This entry was edited (1 day ago)
in reply to Aral Balkan

I always liked GitUp for this. I learned a lot about git workflows by watching the commit graph update in realtime.
This entry was edited (18 hours ago)