如图所示，有两个新功能，分别以branch 1，branch 2实现，并依次合并到develop分支上。
那么问题来了，当我想要把develop合并到master，并发布生产环境时，突然发现branch 1存在严重问题，不能在此版本上线，而branch 2是基于已经merge了branch 1的develop分支开发的，也就是说branch 2的代码中已经包含了branch 1的代码。
请问这样的应用场景，只把branch 2修改的代码merge到master的最佳实践？
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
The principle of git is to track each modified file. You can use git log to check the different contents of the specific submission of the version. After modification, try to request merge again.
In principle, you should use hotfix on the master to modify the problem of branch1. After the repair is completed, merge the hotfix back to master and develop, and then merge develop back to branch2
You can refer to this process http://danielkummer.github.io ...