Custom git merge driver

MERGE CONFLICTS IN git are a normal part of collaboration. But, sometimes you end up in situations of solving the same trivial conflict again and again. That was my situation at $WORK on a busy GitHub Actions pipeline project. The problem GitHub recommends pinning actions to full commit SHAs for Read more…

Xpra

XPRA IS SCREEN for X11, as xpra describes itself on its page. xpra allows to run X11 applications on a remote machine and benefit from the detach/attach workflow known from e.g. screen and tmux. I coincidentally discovered xpra today, when google’ing on how to setup copy to clipboard in tmux Read more…

Debian On Macbook

LIBERATED AT LAST. No more torment and self-punishment of using Mac OS X. I finally caved and wiped the Apple operating system from my Macbook and installed Debian and KDE 4. Sweet. For a long time I’ve been reluctant to wipe the Mac OS X. I wouldn’t just give up Read more…