This works in simple cases: git rebase –preserve-merges master Thanks to @Techlive Zheng in the comments. You may see fatal: refusing to merge unrelated histories Error redoing merge a95986e… Which means that git failed to automatically apply your subtree. This puts you in the situation @ericpeters described in his answer. Solution: Re-add your subtree (use … Read more
I found the answer on this blog comment https://coderwall.com/p/ssxp5q If you come across the “Updates were rejected because the tip of your current branch is behind. Merge the remote changes (e.g. ‘git pull’)” problem when you’re pushing (due to whatever reason, esp screwing about with git history) then you’ll need to nest git commands so … Read more
Which is best for you depends on your needs, desires, and workflow. They are in some senses semi-isomorphic, it is just some are a lot easier to use than others for specific tasks. gitslave is useful when you control and develop on the subprojects at more of less the same time as the superproject, and … Read more
You should be careful to note explicitly what you are talking about when you use the term ‘subtree’ in the context of git as there are actually two separate but related topics here: git-subtree and git subtree merge strategy. The TL;DR Both subtree related concepts effectively allow you to manage multiple repositories in one. In … Read more
It turns out that the answer is much simpler if you’re simply trying to glue two repositories together and make it look like it was that way all along rather than manage an external dependency. You simply need to add remotes to your old repos, merge them to your new master, move the files and … Read more
submodule is link; subtree is copy
The Easy Way™ It turns out that this is such a common and useful practice that the overlords of Git made it really easy, but you have to have a newer version of Git (>= 1.7.11 May 2012). See the appendix for how to install the latest Git. Also, there’s a real-world example in the … Read more
If you want to merge project-a into project-b: cd path/to/project-b git remote add project-a /path/to/project-a git fetch project-a –tags git merge –allow-unrelated-histories project-a/master # or whichever branch you want to merge git remote remove project-a Taken from: git merge different repositories? This method worked pretty well for me, it’s shorter and in my opinion a … Read more