1. Reference: Using git cherry-pick in the command line.
2. Reference: https://tortoisegit.org/docs/tortoisegit/tgit-dug-cherrypick.html .
3. Switch to branch B to cherry-pick commits from branch A to branch B. Show log. As shown in Figure 1.
4. Click branch B to select branch A. As shown in Figure 2.
5. Select branch A. You will subsequently select a commit ID from this branch to cherry-pick to branch B. The current branch remains branch B. As shown in Figure 3.
6. Select the commit ID to cherry-pick from branch A. As shown in Figure 4.
7. Select all and click Continue. As shown in Figure 5.
8. Conflicts occur during the process, as shown in Figure 6.
9. Right-click the conflicted file and resolve the conflict using the commit ID. Confirm marking the conflicted file as resolved? Yes. As shown in Figure 7.
10. Click Commit, as shown in Figure 8.
11. Select Ignore, as shown in Figure 9.
12. The current commit will be empty (for example, due to conflict resolution). Skip this commit or keep only the commit message? Skip. As shown in Figure 10.
13. During conflicts, some conflicted files may require manual resolution, as step 9 does not apply to all conflicted files. For example, a conflicted file might already contain code implementations from other commit IDs. As shown in Figures 11 and 12.
14. After manually resolving the conflict, right-click to resolve and commit. As shown in Figure 13.
15. This is a merge commit. Which parent node do you want to pick? As shown in Figure 14.
16. You should select parent node 1: When installing the theme, the configuration items are stored in the database based on the theme’s ignore settings. As shown in Figure 15.
17. Force push to the server.