Skip to main content




in reply to Q.U.I.N.N.

one feature of jj is parallel branches. this replaces quilt/topgit/etc. instead of having to manage things as patches (and a repo to manage changes to patches) you can just make a new revision that is on top of N other branches. (they removed the merge command it wasn't needed anymore.)

so you can have patches alongside upstream and just tell it go ahead and merge them all together now (but preserve them as parallel lines in the history.)

conflicts don't block a commit so resolving merge conflicts gets saved (like darcs, pijul) and you don't need to do anything weird when rebasing them. it just works. :blobcatshrug2:



I’m making xmas cookies for my friends & family & *might* make some personalised notecards to go with them.

So naturally I’m in a pinterest hole of personalised stationery, why did we stop sending letters via snail mail??

This entry was edited (2 weeks ago)




Iceland decides not to participate in Eurovision 2026 byteseu.com/1626912/ #Boycott #EuropeanBroadcastingUnion #eurovision #Featured #Iceland #Israel #Poland








El otro día compré romanesco, ¿cuál es vuestra receta infalible?
in reply to Naiara

Al horno hasta que todos las puntas quedan crujientitas (no lo sé hacer de otra manera)




NEW RESOURCES

International Council on Archives: SAHR Announces its New Database “Truth and Reconciliation Mechanisms Archives Locator” (TRMAL) on International Human Rights Day and Discusses Human Rights Archives. “The TRMAL is a unique tool that for the first time allows researchers, conflict-affected citizens, legal scholars and anyone interested to search for the archives that […]

researchbuzz.me/2025/12/14/tru…




We went present shopping yesterday (super overstimulating) but toy shops do actually have a fair bit of fidgets! I found a lovely green metallic tangle at a reduced price! It's fun to twirl and squeeze! I wish the sounds it made were less plasticky or that it would make no sound at all, but it's nonetheless quite satisfying!
#ActuallyAutistic


A new old idea about video stores

Plus, in this week’s Installer: Knives Out is back, a great skating game, a new way to fix your gear, and much more.