flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-06 14:36:18 +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:56:20 +02:00
parent 5c0301ea7d
commit 82e599025b
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logseq/bak/refusing to merge unrelated histories.md.2022-05-26T16_55_30.471Z
+11
View File
@@ -0,0 +1,11 @@
- an [[error]].
- 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.
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`. But then if you want to merge the two you get into problems as [[git]] doesn't merge unrelated histories by default.
- #go https://stackoverflow.com/questions/39761024/refusing-to-merge-unrelated-histories-failure-while-pulling-to-recovered-repos/39783462#39783462
This [[stack overflow]] answer contains the flag you need: `--allow-unrelated-histories`.
logseq/bak/refusing to merge unrelated histories.md.2022-05-26T16_55_55.662Z
+11
View File
@@ -0,0 +1,11 @@
- an [[error]].
- 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.
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`. But then if you want to merge the two you get into problems as [[git]] doesn't merge unrelated histories by default.
- #go https://stackoverflow.com/questions/39761024/refusing-to-merge-unrelated-histories-failure-while-pulling-to-recovered-repos/39783462#39783462
This [[stack overflow]] answer contains the flag you need: `--allow-unrelated-histories`. I guess [[git]] doesn't include it in the error message to prevent people from just tacking it on without knowing what they are doing (just to make the error go away) and having a mess as a result.