svn (with git frontend) branch merging with different directory structure
Posted
by Fu86
on Stack Overflow
See other posts from Stack Overflow
or by Fu86
Published on 2010-05-03T09:40:25Z
Indexed on
2010/05/03
9:48 UTC
Read the original article
Hit count: 276
I have a subversion repository with a directory structure:
frontend
backend
+ a
+ b
In a other branch, someone had put the sub-folders a and b in the root directory and delete the other stuff (frontend, backend).
a
b
Now i have to merge this branch back into the trunk (backend-folder). How can I do that to dont lose the history from the branches? I use git to access and work with the subversion repository.
© Stack Overflow or respective owner