Possible to merge branches that have been copied in the past but do not share the same root?

Question

I have used svn2git to convert a large SVN repository of 10+ thousand commits to a Git repository.

The Git repository works fine but was substantially larger in file size compared to the SVN repo.
The cause for this seems to be that the SVN branches have not been properly created as a new branch, but rather copied the entire file content from the master and worked on top of that.

Therefore, all of the Git branches are behind the master by 10k+ commits. As the process of manually recreating each branch and running svn2git again would take days, I was wondering whether its possible to merge the root of these related trees to a single source but keep the HEAD separated to continue work on the branches.

Let me know if you need additional information.

Which `svn2git` tool did you use? There are many of them. – 1615903 Jan 27 '17 at 11:19 — 1615903, Jan 27 '17 at 11:19
This one: https://github.com/nirvdrum/svn2git – fasoh Jan 27 '17 at 17:35 — fasoh, Jan 27 '17 at 17:35

score 0 · Answer 1 · edited Jun 20 '20 at 09:12

0

In git you cant merge 2 branch with unrelated history but you can do something else which will work.

`git cherry-pick`

git cherry-pick start..end allow you to pick any commit range from you local repository to any branch regardless to its origin. This will allow you to "import" any commits form any branch to any other branch in your repo.

edited Jun 20 '20 at 09:12

Community

1
1

answered Jan 27 '17 at 10:17

CodeWizard

128,036
21
144
167

How about `--allow-unrelated-histories` option of `git merge`? – Vampire Jan 28 '17 at 10:27

Possible to merge branches that have been copied in the past but do not share the same root?

1 Answers1

git cherry-pick

`git cherry-pick`