84669 person learning
152542 person learning
20005 person learning
5487 person learning
7821 person learning
359900 person learning
3350 person learning
180660 person learning
48569 person learning
18603 person learning
40936 person learning
1549 person learning
1183 person learning
32909 person learning
代码有 B分支和A分支现在要把B分支合并到A分支上B分支有开发1的代码和开发2的代码。开发1和开发2的提交代码历史:1->2->1->1问题是怎么去掉开发2的代码只把开发1的代码合并到A分支上?
B分支
A分支
1->2->1->1
求大神指点~~
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
git rebase B A
Revert 2 commits on branch B, and then do a rebase and merge
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
git rebase B A
Revert 2 commits on branch B, and then do a rebase and merge