From 2dbfa6ddaec588ddf811e543ca5d3ca542a66958 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Thu, 26 May 2022 18:52:20 +0200 Subject: [PATCH] Auto saved by Logseq --- refusing to merge unrelated histories.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 refusing to merge unrelated histories.md diff --git a/refusing to merge unrelated histories.md b/refusing to merge unrelated histories.md new file mode 100644 index 000000000..6b2fc2354 --- /dev/null +++ b/refusing to merge unrelated histories.md @@ -0,0 +1,6 @@ +- an [[error]]. + - [[git]]. + +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. + +Case in point: writing the README first when creating the repository in [[gitlab]] or [[github]] makes sense to me, as it's checking a checkbox and editing. And uploading a set of bootstrapping files then makes sense as a second step to me -- but that is ideally done right at the place files live, and once there it's easy to just say `git init`.