我们有一个包含 400 多个提交的 Git 存储库，其中前几十个是大量反复试验。我们希望通过将许多提交压缩为单个提交来清理这些提交。自然， git-rebase 似乎是要走的路。我的问题是它以 merge 冲突结束，而这些冲突并不容易解决。我不明白为什么应该有任何冲突，因为我只是在压缩提交(而不是删除或重新排列)。很可能，这表明我并不完全理解 git-rebase 如何进行挤压。

这是我正在使用的脚本的修改版本:

repo_squash.sh(这是实际运行的脚本):

rm -rf repo_squash
git clone repo repo_squash
cd repo_squash/
GIT_EDITOR=../repo_squash_helper.sh git rebase --strategy theirs -i bd6a09a484b8230d0810e6689cf08a24f26f287a

if grep -q "pick " $1
then
#  cp $1 ../repo_squash_history.txt
#  emacs -nw $1
  sed -f ../repo_squash_list.txt < $1 > $1.tmp
  mv $1.tmp $1
else
  if grep -q "initial import" $1
  then
    cp ../repo_squash_new_message1.txt $1
  elif grep -q "fixing bad import" $1
  then
    cp ../repo_squash_new_message2.txt $1
  else
    emacs -nw $1
  fi
fi

# Initial import
s/pick \(251a190\)/squash \1/g
# Leaving "Needed subdir" for now
# Fixing bad import
s/pick \(46c41d1\)/squash \1/g
s/pick \(5d7agf2\)/squash \1/g
s/pick \(3da63ed\)/squash \1/g

Finished one cherry-pick.
# Not currently on any branch.
nothing to commit (working directory clean)
Could not apply 66c45e2... Needed subdir

Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>', and
run 'git rebase --continue'
Could not apply f1de3bc... Incremental

# Not currently on any branch.
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
# modified:   repo/file_A.cpp
# modified:   repo/file_B.cpp
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified:      repo/file_X.cpp
#
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
# deleted:    repo/file_Z.imp

rm -rf repo_squash
git clone repo repo_squash
cd repo_squash/
git rebase --strategy theirs -i bd6a09a484b8230d0810e6689cf08a24f26f287a

git rebase -i bd6a09a484b8230d0810e6689cf08a24f26f287a

#========================================================
# Initialize directories
#========================================================
rm -rf test_squash/ test_squash_clone/
mkdir -p test_squash
mkdir -p test_squash_clone
#========================================================

#========================================================
# Create repository with history
#========================================================
cd test_squash/
git init
echo "README">README
git add README
git commit -m"Initial commit: can't easily access for rebasing"
echo "Line 1">test_file.txt
git add test_file.txt
git commit -m"Created single line file"
echo "Line 2">>test_file.txt 
git add test_file.txt 
git commit -m"Meant for it to be two lines"
git checkout -b dev
echo Meaningful code>new_file.txt
git add new_file.txt 
git commit -m"Meaningful commit"
git checkout master
echo Conflicting meaningful code>new_file.txt
git add new_file.txt 
git commit -m"Conflicting meaningful commit"
# This will conflict
git merge dev
# Fixes conflict
echo Merged meaningful code>new_file.txt
git add new_file.txt
git commit -m"Merged dev with master"
cd ..

#========================================================
# Save off a clone of the repository prior to squashing
#========================================================
git clone test_squash test_squash_clone
#========================================================

#========================================================
# Do the squash
#========================================================
cd test_squash
GIT_EDITOR=../test_squash_helper.sh git rebase -i HEAD@{7}
#========================================================

#========================================================
# Show the results
#========================================================
git log
git gc
git reflog
#========================================================

# If the file has the phrase "pick " in it, assume it's the log file
if grep -q "pick " $1
then
  sed -e "s/pick \(.*\) \(Meant for it to be two lines\)/squash \1 \2/g" < $1 > $1.tmp
  mv $1.tmp $1
# Else, assume it's the commit message file
else
# Use our pre-canned message
  echo "Created two line file" > $1
fi

最佳答案

好吧，我有足够的信心抛出一个答案。也许必须编辑它，但我相信我知道你的问题是什么。

您的玩具 repo 测试用例中有一个 merge - 更糟糕的是，它 merge 了冲突。并且您在 merge 中重新定位。无 -p (这并不完全适用于 -i )， merge 被忽略。这意味着当 rebase 尝试挑选下一个提交时，您在冲突解决中所做的任何事情都不存在，因此它的补丁可能不适用。 (我相信这显示为 merge 冲突，因为 git cherry-pick 可以通过在原始提交、当前提交和共同祖先之间进行三向 merge 来应用补丁。)

不幸的是，正如我们在评论中指出的，-i和 -p (保留 merge )相处得不是很好。我知道编辑/改写有效，而重新排序则无效。但是，我相信它适用于南瓜。这没有记录，但它适用于我在下面描述的测试用例。如果您的情况更加复杂，您可能会在做自己想做的事情时遇到很多麻烦，尽管它仍然是可能的。 (故事的寓意:在 merge 之前用 rebase -i 清理。)

因此，假设我们有一个非常简单的案例，我们想将 A、B 和 C 压缩在一起:

- o - A - B - C - X - D - E - F (master)
   \             /
    Z -----------

关于git - 当我所做的只是压缩提交时，为什么 git-rebase 会给我 merge 冲突？，我们在Stack Overflow上找到一个类似的问题： https://stackoverflow.com/questions/3133449/