2 bookmarks for 2024-01-02

7085.

toot by https://hachyderm.io/@mgattozzi

hachyderm.io/@mgattozzi/111686715833183505

Git is a frustratingly useful tool that has many lesser known features that really should be on by default. Today I wrote about one of them: zdiff3. It makes merge conflicts easier to work through and frees you up for more important things.

<https:ductile.systems/zdiff3>

7086.

toot by https://hachyderm.io/@VimLinks

hachyderm.io/@VimLinks/111686469194570638