1. On the develop branch in the local environment, running a console command produced an error, as shown in Figure 1.
2. This bug has already been fixed in the single commit (ee8290) on the feature-netease branch, as shown in Figure 2.
3. Therefore, I decided to use TortoiseGit to one-way merge the single commit (ee8290) from the feature-netease branch into the develop branch.
4. View the commits on the develop branch in GitLab, as shown in Figure 3.
5. View the commits on the feature-netease branch in GitLab, as shown in Figure 4.
6. In the local repository, switch to the develop branch, right-click, and select TortoiseGit -> Merge, as shown in Figure 5.
7. Select Commit and click the Browse button, as shown in Figure 6.
8. Check All branches, select the single commit (ee8290), right-click, and choose Cherry Pick this commit, as shown in Figure 7.
9. In the cherry-pick prompt dialog, select the commit (ee8290) and click Continue, as shown in Figure 8.
10. Conflicts exist. After manually resolving the conflicts, mark them as resolved, as shown in Figures 9 and 10.
11. In the cherry-pick prompt dialog, click Commit, as shown in Figure 11.
12. In the cherry-pick prompt dialog, click Done, as shown in Figure 12.
13. Right-click, select TortoiseGit -> Push, and the push succeeds, as shown in Figure 13.
14. View the commits on the develop branch in GitLab. The commit (ee8290) has been merged into the develop branch, as shown in Figure 14.
15. View the commits on the feature-netease branch in GitLab. There are no changes, as expected, as shown in Figure 15.
16. On the develop branch in the local environment, running the console command succeeds, as shown in Figure 16.
