Conversation

Notices

1. Embed this notice
   Aral Balkan (aral@mastodon.ar.al)'s status on Wednesday, 29-Apr-2026 02:36:07 JST Aral Balkan

   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 loader tests in Kitten², as I’m refactoring to implement the upcoming breaking change in the stateful components API³ as it affects the stateful layout components in Markdown pages.)

   ¹ Which I always have running, full-screen on its own monitor.
   ² https://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

   • Embed this notice
     Aral Balkan (aral@mastodon.ar.al)'s status on Wednesday, 29-Apr-2026 05:28:36 JST Aral Balkan

     in reply to

     • Russell Garner

     @rgarner Hadn’t heard of Fork. Looks really nice. The manor 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 folks like interactive rebases. So I might actually give Fork a shot too ;)

   • Embed this notice
     Russell Garner (rgarner@mastodon.social)'s status on Wednesday, 29-Apr-2026 05:28:37 JST Russell Garner

     in reply to

     @aral 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?