The git branch is merged from B to A, but there are codes 1 and 2 in branch B. How to remove the code of 2 and only merge the code of 1 from B to A?

Question

The code has branch B and branch A. Now we need to merge branch B into branch A. Branch B has the code of development 1 and the code of development 2. The submitted code history of development 1 and development 2: 1-&gt;2-&gt;1-&gt;1 The question is how to remove the code of development 2 and only merge the code of development 1 into the A branch? Ask God for guidance~~

PHPz · Answer

It seems that you can only create a new branch from branch A? After development is completed, go directly to branch A instead of going through branch B and then to branch A

大家讲道理 · Answer

git rebase B A

天蓬老师 · Answer

Revert 2 commits on branch B, and then do a rebase and merge