8 commits

Author	SHA1	Message	Date
Julie Kirsch	c55e4690fb	final?	2024-05-26 23:21:45 +02:00
Julie Kirsch	38a66fa04d	merge request	2024-05-26 23:01:49 +02:00
Julie Kirsch	a6cd840695	finalchanges	2024-05-14 23:13:39 +02:00
Tom van Woudenberg	ca7988f940	Back again with some fixed	2024-04-12 08:11:50 +02:00
Tom van Woudenberg	b107b47d06	Added full steps to overview as well	2024-04-11 16:56:56 +02:00
Tom van Woudenberg	c6a07f1ae2	Now really last commit for today	2024-04-11 16:00:29 +02:00
Tom van Woudenberg	f44ac6bbdd	Added user types, restructured sollaborative book-editing	2024-04-11 12:28:44 +02:00
Tom van Woudenberg	05f7e7e86a	Moved stuff from install chapter and restructured	2024-03-25 09:56:38 +01:00

Renamed from book/installation-and-setup/git-merge.md (Browse further)