I use and love Spacemacs, but their branch handling is a major PR fuckup. The last stable version should be phased out now. The develop branch works way better. They should rethink their release model.

True, just think they need to embrace the fast development cadence of develop and just make that master.

Interesting. I switched to the develop branch the other day (yes, just to try to get LSP working!) and ran into some glitch that I didn't have the time to investigate -- a complaint about the .spacemacs file missing a variable or something. I'll probably try again this weekend.

You need to run SPC f e D to do a 3-way merge of your .spacemacs everytime after you upgrade Spacemacs.

As changes to Spacemacs are made, there might need more or less things in the .spacemacs file. So you always need to do a manual merge of the changes.

Thanks for the tip. I had no idea that was a thing -- although it absolutely makes sense, thinking about it!