Merge any sequence of patches (e.g. rebasing a branch) feels like it relies on hope. Whether or not you get conflicts, whether or not the output is syntactically valid or does the right thing: sometimes the computer does too little, and other times it does too much.
miniblog.
Related Posts
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.
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've released difftastic 0.50!
In this release:
* Merge conflicts! Difftastic now understands <<<<<<< syntax and shows a syntactic diff of the underlying files.
* Updated parsers for Elixir, Erlang, Go, Kotlin and Racket
* Various styling quality-of-life improvements


