Last shared use webstorm simple configuration git commit code at this time to cherry pick and sharing system and application patches
1.cherry pick (the code required to cherry pick target branch)
First switch to the branch target (shown below)
Then select the log needs to cherry pick the commit record right choice cherry pick, then if there is a conflict to resolve the conflict, the conflict did not commit code
2. patch (patch applications fact, almost all elected and cherry pick what you want code into the target branch)
Select the right to submit records to create a patch (you can also operate as shown below), this patch is created successful (.patch will generate a file), and then is stored in a place easy to find, the next step is to apply the patch (as shown below)
Select the target application would give birth to .patch files, so ok