如何合并两个位于不同本地存储库/文件夹中的git分支？

Question

我有:

folder_a/app_1.0
folder_b/app_1.1

让我们说我正在两个文件夹/回购中的主分支工作.

如何将分支合并在一起？

Answer 1

您必须将提交从一个存储库提取到另一个存储库,执行合并,然后回到第一个存储库(如果您希望两个存储库都包含所有提交).

# switch to repo A
cd folder_a

# Add repo B as a remote repository
git remote add folderb /path/to/folder_b

# Pull B's master branch into a local branch named 'b'
git pull folderb master:b

# Merge b into A's master branch
git merge b

# Switch to repo B
cd ../folder_b

# Add repo A as a remote repository
git remote add foldera /path/to/folder_a

# Pull the resulting branch into repo B's master branch
git pull foldera master:master