4 Commits

Author	SHA1	Message	Date
Bjarke Sporring	575e083f33	refactor: rewrite the merge-revert section ... It is an advanced and difficult revert to accomplish and should probably be done through a reset instead, which means that we're modifying history which is dangerous and so should be handled by someone who understands these dangers.	2026-01-15 16:11:24 +01:00
Bjarke Sporring	aa24c50b45	fix: revert conflict	2026-01-15 15:50:54 +01:00
Bjarke Sporring	9fbdd941fa	feat: check for mainbranch	2026-01-15 14:31:00 +01:00
Bjarke Sporring	7b638d27de	refactor: we're breaking out merge-conflicts	2026-01-15 12:51:43 +01:00