Today I learnt about `git apply --reject`, which applies as much of a patch as it can, and leaves the remaining conflicting changes in foo.rej files:
miniblog.
Related Posts
I made some changes to a node express project that I haven't touched in almost five years. I was pleasantly surprised that I only needed to update one dependency to get it working again!
(It was sqlite3, which is a native dependency using node-gyp.)
I really like the MELPA model of packaging directly from git. It solves the problem of forgetting to release something -- just merge a PR and you're done.
It also makes version number bumps much less important.
You could go even further in a statically typed language and also figure out when breaking changes occur.
I'm experimenting with Hammerspoon on macOS as an application switcher. `Option-Space F` is Firefox, `Option-Space E` is Emacs, etc.
The problem with `Alt-Tab` is that the order changes based on recency. I'm hoping that a repeatable command will be nicer to use.