New free online training announced: "Collaborative git without GitHub" by @petrichor 🧑‍💻

> Although git was created as a decentralised way to collaborate, the practical needs of day-to-day work have pushed most of us to use it through a centralised platform (generically called a “forge”), of which the most common is Microsoft’s GitHub.

📅 3 September 2025, 16:00 - 17:30 CET

More info and sign up:
https://events.digital-research.academy/event/110/

#git#VersionControl

New free online training announced: "Collaborative git without GitHub" by @petrichor 🧑‍💻

> Although git was created as a decentralised way to collaborate, the practical needs of day-to-day work have pushed most of us to use it through a centralised platform (generically called a “forge”), of which the most common is Microsoft’s GitHub.

📅 3 September 2025, 16:00 - 17:30 CET

More info and sign up:
https://events.digital-research.academy/event/110/

#git#VersionControl

Game of Trees 0.117 released https://www.undeadly.org/cgi?action=article;sid=20250818074301 #openbsd #gameoftrees #got #git #development #programming #versioncontrol #freesoftware #libresoftware

Game of Trees 0.117 released https://www.undeadly.org/cgi?action=article;sid=20250818074301 #openbsd #gameoftrees #got #git #development #programming #versioncontrol #freesoftware #libresoftware

Game of Trees 0.116 released https://www.undeadly.org/cgi?action=article;sid=20250726073234 #openbsd #gameoftrees #git #got #development #versioncontrol #freesoftware #libresoftware

Game of Trees 0.116 released https://www.undeadly.org/cgi?action=article;sid=20250726073234 #openbsd #gameoftrees #git #got #development #versioncontrol #freesoftware #libresoftware

So I made a tool for managing little changes in code&text and it seems to run well enough now, so sharing.

The diff is like from git diff --word-diff, but you can automerge same-line edits, retain spacing&indentation from a selected version, and send the small edits around as patches. Also works great for #LaTeX and #markdown (merging these with plain git is pure pain).

https://github.com/exaexa/werge (is #haskell )

#versioncontrol #programming

So I made a tool for managing little changes in code&text and it seems to run well enough now, so sharing.

The diff is like from git diff --word-diff, but you can automerge same-line edits, retain spacing&indentation from a selected version, and send the small edits around as patches. Also works great for #LaTeX and #markdown (merging these with plain git is pure pain).

https://github.com/exaexa/werge (is #haskell )

#versioncontrol #programming