Menu
I'm trying to figure out how 'git subtree' works. I've followed all directions on this page, but I always get an error trying to merge the subtree project in my own repo ('Step 2'): fatal: refusing to merge unrelated histories.
I've read this post, and when I use the --allow-unrelated-histories option, it seems to work fine. However, I'm not sure whether I should use this...My impression is that the whole point of subtrees is to have unrelated histories within one repository, so it feels strange to have to add the option. Should I add it nevertheless, or am I doing something wrong?
I'm using git v2.9.3 on osx 10.11.6
904
The alternative (and longer) way of fixing the fatal: refusing to merge unrelated histories issues is to unstage your current commits, stash them, clone your required remote repository, and then place your stashed branch contents into the new clone.
Start Learning. The “fatal: refusing to merge unrelated histories” Git error occurs when two unrelated projects are merged (i.e., projects that are not aware of each other's existence and have mismatching commit histories).
To combine two separate Git repositories into one, add the repository to merge in as a remote to the repository to merge into. Then, combine their histories by merging while using the --allow-unrelated-histories command line option.
In fact, all you need to do to merge unrelated branches is to use the flag --allow-unrelated-histories . This tells Git to combine all the files and commits of both unrelated branches into one branch, as long as there are no file conflicts.
If the subtree was added using --squash, you need to also use --squash when you pull
git subtree pull --prefix=<folder-goes-here> <remote-goes-here> <branch-goes-here> --squash
136
I've been struggling with this for a while and think I found the solution.
I'm pretty new to git so forgive me if I use the wrong names for things.
The problem may have come from you using the --squash option when you ran the git subtree add command.
Try removing the subtree (remove the remote repository and delete all the local files, commit, and push). Then redo the subtree add without the --squash option.
I then jumped over to my subtree repository, made some changes, committed and pushed, then hopped back to my main superproject repository and did a git subtree pull. It gave me some error about the working tree having modifications. To get around that I did a git checkout master, then a git push, then tried the subtree pull again. It worked.
Hope that helps.
36
What worked for me was using git merge with subtree strategy:
git merge -s subtree -Xsubtree="$prefix" subremote/branch --allow-unrelated-histories
git subtree uses something similar to that under the hood.
39
This was a bug in git, it was fixed in https://github.com/git/git/commit/0f12c7d4d175bb0566208213b1b340b6794f305c
See also: https://www.spinics.net/lists/git/msg282340.html
25
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
