上周,我按照概述in this blog的步骤将两个git存储库合并到一个新的存储库中。据我所知,这一切都很顺利。所有文件都存在。我能够通过他们的SHA找到所有提交。
现在,我正在使用TortoiseGit检查单个文件的日志历史记录。我已启用“关注重命名”。当我查看历史记录时,我没有看到任何转移到新存储库的分支的提交消息,但我确实看到了旧分支的所有提交消息:
当我运行gitk --follow User.cs
时,我能够按预期看到提交消息:
我采取的步骤尝试解决:
我的两台计算机上出现此问题。合并两个存储库时使用了这两台机器。我的同事都没有遇到过这个问题。他们没有使用他们的PC协助合并存储库。
问题:是否有人知道我应该考虑修复我的TortoiseGit实例的任何其他缓存,设置或其他配置选项?
供参考,博客中列出的步骤为:
# Assume the current directory is where we want the new repository to be created
# Create the new repository
git init
# Before we do a merge, we have to have an initial commit, so we’ll make a dummy commit
dir > deleteme.txt
git add .
git commit -m “Initial dummy commit”
# Add a remote for and fetch the old repo
git remote add -f old_a <OldA repo URL>
# Merge the files from old_a/master into new/master
git merge old_a/master
# Clean up our dummy file because we don’t need it any more
git rm .\deleteme.txt
git commit -m “Clean up initial file”
# Move the old_a repo files and folders into a subdirectory so they don’t collide with the other repo coming later
mkdir old_a
dir –exclude old_a | %{git mv $_.Name old_a}
# Commit the move
git commit -m “Move old_a files into subdir”
# Do the same thing for old_b
git remote add -f old_b <OldB repo URL>
git merge old_b/master
mkdir old_b
dir –exclude old_a,old_b | %{git mv $_.Name old_b}
git commit -m “Move old_b files into subdir”
##########################
# Bring over a feature branch from one of the old repos
git checkout -b feature-in-progress
git merge -s recursive -Xsubtree=old_a old_a/feature-in-progress
答案 0 :(得分:0)
请尝试从您分享的第一张图片中选择刷新按钮(左下角)上方的所有分支。你会发现所有的分支和提交历史。