Idea merges the newly added modifications to the previous version

After the project goes online , A loophole was found , Need to repair previous version , This is where git Of cherry pick Methods

First step , Find the trunk that needs to be modified , The new branch

The second step ：git Find the need cherry pick Version code

The third step ： Right click to find cherry pick The button , Merger conflict

Step four ： Submission code , Application code review and MR Merge code