Based on TortoiseGit, one-way merge process on the feature-netease branch (EE8290) to the develop branch

1. On the develop branch in the local environment, execute the console command and report an error: as shown in Figure 1

Figure 1

2. Since this bug has been fixed in a single commit (EE8290) on the feature-netease branch, as shown in Figure 2

Therefore, it is decided to merge a single commit (EE8290) on the develop branch on the feature-netease branch based on TortoiseGit .

4. View the commit on the develop branch on GitLab, as shown in Figure 3

Figure 3

5. View the commit on the feature-netease branch on GitLab, as shown in Figure 4

Figure 4

6. In the local repository, switch to the develop branch, right-click, and TortoiseGit -> Merge, as shown in Figure 5

Figure 5

7. Select submit and click the browse button, as shown in Figure 6

Figure 6

8. Check all the branches, select a single submission (EE8290), right-click, and extract this submission, as shown in Figure 7

Figure 7

9. In the pop-up picking prompt box, click Select Submit (EE8290), click Continue, as shown in Figure 8

8

10. If there is a conflict, it needs to be manually resolved after the conflict is marked as resolved, as shown in Figure 9. Figure 10

Figure 9

Figure 10

11. In the pop-up picking prompt box, click Submit, as shown in Figure 11

Figure 11

12. In the pop-up picking prompt box, click Finish, as shown in Figure 12

Figure 12

13. Right-click, TortoiseGit -> Push, the push is successful, as shown in Figure 13

Figure 13

14. View the commit on the develop branch on GitLab, the commit (EE8290) has been merged into the develop branch, as shown in Figure 14

Figure 14

15. View the commit on the feature-netease branch on GitLab, no change, in line with expectations, as shown in Figure 15

Figure 15

16. On the develop branch in the local environment, the execution of the console command is successful, as shown in Figure 16

Figure 16