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
元旦前，周一到周五我在a分支上写了好多代码，然后提了merge request到develop，然后合并了，没有上线。由于没有测，先给我腿回来了，develop退回了之前的版本。在周五下午有个紧急需求，我从master上从新拉了一个分支b写了部分代码，合并并且上线。然后我把我本地的master从线上拉下最新代码，在a分支上把master merge过来。此时我a分支代码变成了master上了，我a分支写的代码没有了。怎么合才不会少啊？
I think you should first restore your a-part log to the version you last submitted, and then commit一下，再把对应的主干分之master合并过来，在执行push
commit
master
push
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
I think you should first restore your a-part log to the version you last submitted, and then
commit一下，再把对应的主干分之master合并过来，在执行push