I am migrating contents of a branch from one repo to two newly created repos. Lets say, I have a "Product-A" branch (containing components X and Y), the contents of which are being migrated to 2 newly created repos (one for each of X, Y). I have pushed the contents of Product-A branch onto master of new repos successfully. On the day of migration, I locked Product-A branch to prevent any check-ins. My problem is - how can I bring the master branch of new repos in sync with latest commits on Product-A? The contents on new repos have been manipulated to an extent where the directory structure on Product-A branch (of old repo) looks different from contents on new repos. A merge is practically not easy because of these changes. I appreciate any suggestions, thanks in advance.
问问题
127 次
1 回答
0
你看过像git-stitch-repo这样的工具吗？或者这个问题： 组合多个 git 存储库？
从您的问题来看，在不解决目录结构更改的情况下，“同步”的含义有点难以理解。你的意思是同步在不同目录中的相同文件的某种方式吗？
我，我会在每个 repo 中创建一个特殊的“sync_branch”，合并来自产品 A 的更改，而不是将该分支合并到 master。
于 2012-10-01T23:28:33.153 回答