miniblog.

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.

Lots of polish and neat new features in git 2.20! https://lkml.iu.edu/hypermail/linux/kernel/1812.1/00293.html I like the new 'break' command for rebasing. Easy to explain and easy to use.

I end up regularly rebasing my feature branches as I work. Are branches the best abstraction? Perhaps patch sets are better.