flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-07 15:06:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto saved by Logseq

Browse Source
This commit is contained in:
Flancian
2022-05-26 18:52:20 +02:00
parent 58091bd1ae
commit 2dbfa6ddae
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
refusing to merge unrelated histories.md
+6
View File
@@ -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`.