Tag: submit
-
Post Views: 16 1. In Windows 10, Git 2.34, and TortoiseGit 2.13, after the directory is renamed (the lowercase letters are changed to uppercase letters), there is no change when submitting. as shown in Figure 1 2. Manually rename it to small letters first, enter the directory after renaming, right-click – change the name, and then modify it to uppercase.…
-
Post Views: 71 1. Reference: Use of git cherry-pick on the command line 2. Reference: https://tortoisegit.org/docs/tortoisegit/tgit-dug-cherrypick.html . 3. Switch to branch B and extract the commit of branch A to branch B. Display logs. as shown in Figure 1 4. Click Branch B to select Branch A. as shown in Figure 2 5. Select Branch A, and then select…
-
Post Views: 17 1. Now you need to apply some commits on branch A to branch B. 2. Switch to branch: B, execute the command: git cherry-pick fbf19e86. Error: Conflict (Content): merge Conflict in platform/app/services/themeservice.php . Error: could not apply fbf19e86f4… . as shown in Figure 1 3. The reason was found. The reason is that there are still some…
-
Post Views: 13 1. On the develop branch in the local environment, execute the console command and report an error: as shown in 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…
-
Post Views: 16 1. View the commit on the develop branch on GitLab, as shown in Figure 1 2. View the commit on the wx-auth branch on gitlab, as shown in Figure 2 3. In the local repository, switch to the develop branch, right-click, and TortoiseGit -> Merge, as shown in Figure 3 4. From the remotes/origin/wx-auth branch (why the…