在向 Gerrit 提交之前的提交后，如何提交额外的提交？

Question

我正在尝试在向 Gerrit 提交之前的提交后提交额外的（不相关的）提交。我在两个不同的分支上创建了上一个和当前的提交。这是工作流程的示例：

git checkout -b <branch-1>
git add folder1/*
git commit -m "Added folder1."
git review

提交给Gerrit，输出包含link的信息给review。之后，我开始进行另一个（同样，无关的）更改：

git checkout -b <branch-2>
git add folder2/*
git commit -m "Added folder2."
git review

正是在这一点上，我遇到了以下情况：

You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.

The outstanding commits are:
373ea8b (HEAD -> branch-2) Added folder2.
e626f4c (branch-1) Added folder1.

Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: n
Aborting.

如何避免这种冲突？

Answer 1

问题是你在第一次提交的基础上做了第二次提交：

A             <= origin/branch
 \ 
  \-- B       <= branch-1
       \
        \-- C <= branch-2

要在不相关的分支上工作，你应该 "in parallel" 像这样独立提交：

  /-- B <= branch-1
 /
A       <= origin/branch
 \
  \-- C <= branch-2

第一次提交：

git checkout -b <branch-1> origin/<branch>
git add folder1/*
git commit -m "Added folder1."
git review

第二次提交：

git checkout -b <branch-2> origin/<branch>
git add folder2/*
git commit -m "Added folder2."
git review

在向 Gerrit 提交之前的提交后，如何提交额外的提交？

How do I submit an additional commit after submitting previous commit to Gerrit?

git

gerrit