Git - 将旧分支移动到另一个分支叫什么？

Question

我不太知道如何描述这一点，但我正在努力扩大我的词汇量。我正在寻找:

• 这个操作叫什么？
• 如何在 Git 中执行此操作？

这是图片:

描述:

1. I create a branch (beta), make some commits, and merge it back into it's parent branch (alpha).

2. After this merge, the original branch (alpha) has some commits made on it, leaving the old branch, beta, behind.

3. I then want to do some work on the child branch (beta) again. However, first I must move it up to where it's parent is (alpha). What is this action called, and how do I do this?

Answer 1

这称为快进 merge 。 您只需发出即可做到这一点

git merge alpha

处于测试阶段。