git：合并后更新2分支

Question

This is a newbie question. I have 2 branches, branch_A and branch_B . I am in branch A and do a merge with this command:

git checkout branch_A
git merge --commit -m "my commit" branch_B

If there is no conflict, it automatically does the merge and updates the branch_A to new commit. But branch_B is still in same place.

How can I update the branch_B to point in same place than branch_A?

Answer 1

This is a bit unusual, since most of the time you don't need a branch you've merged. So ask yourself if it is really what you want.

If it is, the simplest solution is to merge branch_B with branch_A . It won't create a merge commit, because it can be fast-forwarded, but it will point to the same place as branch_A . Commands are:

git checkout branch_B
git merge branch_A