From d2f1088ea61f19d915758cf40961cef42e9d051c Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Thu, 26 May 2022 18:55:09 +0200 Subject: [PATCH] autopushed --- refusing to merge unrelated histories.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/refusing to merge unrelated histories.md b/refusing to merge unrelated histories.md index 4a067f3d2..dd739f10f 100644 --- a/refusing to merge unrelated histories.md +++ b/refusing to merge unrelated histories.md @@ -1,5 +1,6 @@ - an [[error]]. - - [[git]]. + - in [[git]] + - [[fatal]] I get this a lot when trying to merge repositories with different histories -- which of course shouldn't happen often, but does happen to me when I'm trying to [[bootstrap]] a new repository.