Question

我在两个不同的Git存储库中有项目，一个在github.com第二个 - 在本地服务器上。所以在两个存储库中我有相同的项目，我需要在本地开发项目然后合并到github repo。所以我用代码

写了win.bat

cd path/to/project-b
git remote add project-a path/to/project-a
git fetch project-a
git merge project-a/master # or whichever branch you want to merge

它无法正常工作，因为我不想创造某种早午餐或做起源＆＃39;在任何项目中。我也试过

cd  ../proj1
git pull origin
cd ../proj2
git pull ../proj1 master
git commit -a
git push origin master

cd  ../proj3/test.git
git fetch -p origin
git push --mirror

cd ../../proj1
git pull origin

ECHO Done...

你能帮我创建一些命令来填补从项目1到项目2的变化吗？或者说我的代码出了什么问题？

Answer 1

所以这是合并两个回购的解决方案

:: Bat merger two Git repositories into one.

::Original project to which we will merge
cd  proj1
git pull origin

::local project from which we will merge to original
cd ../proj2
git pull ../proj1 master
git commit -a
git push origin master


::downloading and merging local project commit hoistory 
cd  ../proj2.git
git fetch -p origin
git push --mirror

cd ../proj1
git pull origin

ECHO Done...
PAUSE

合并两个独立的Git存储库

1 个答案: