Node - Two local git branches have different versions, and the merged code loses code

Question

Before New Year’s Day, I wrote a lot of code on branch a from Monday to Friday, and then submitted a merge request to develop, and then merged it, but it was not online. Since I didn't test it, I got it back first, and develop returned the previous version.
I had an urgent need on Friday afternoon. I pulled a new branch b from master, wrote some code, merged it and put it online.
Then I pulled the latest code from my local master online and merged the master on branch a. At this time, the code of my branch a has become master, and the code written by my branch a is gone.
How can we combine them so that they are not too small?

Answer 1

I think you should first restore your a-part log to the version you last submitted, and then commit一下，再把对应的主干分之master合并过来，在执行push