Category: TortoiseGit
-
Post Views: 16 1. TortoiseGitPlink Fatal Error No Supported Authentication Methods Available (Server Sent: publicKey). as shown in Figure 1 2. I finally decided to replace the address of the remote origin from git@gitee.com:about/xxx.git withhttps://gitee.com/about/xxx.git。如图2 3. Re-execute the pull, when pulling, enter the user name and password respectively: wang-qiang-shui, private token. The pull is successful, no more errors are reported.…
-
Post Views: 16 1. When pulling in TortoiseGit, an error is reported: Error: Some local refs could not be updated; try runningGit Remote Prune OriginTo remove any old, conflicting branches. as shown in Figure 1 2. Check the prompt information carefully and find that there is: error: cannot lock refrefs/remotes/origin/sc/fix/to-be-merged-table-scroller:refs/remotes/origin/sc/fixexists; cannot createrefs/remotes/origin/sc/fix/to-be-merged-table-scroller. as shown in Figure 2 3. Reference: When…
-
Post Views: 15 1. When pulling in TortoiseGit, an error is reported: Error: cannot lock refrefs/remotes/origin/sc/fix:refs/remotes/origin/sc/fix/to-be-merge-orderexists; cannot createrefs/remotes/origin/sc/fix. as shown in Figure 1 2. Reference:Error: cannot lock ref..refs/tagsexists; cannot createrefs/tags/ . 3. Execute the command in git bash: git update-ref -d refs/remotes/origin/sc/fix/to-be-merge-order. as shown in Figure 2 4. Pull in TortoiseGit again, no more errors, and the pull is successful.…
-
Post Views: 20 1. TortoiseGit detects that the file does not exist, but has been temporarily stored as “Add” or “Modify” in “Index”. The Submit dialog box cannot be handled. Do you want to recover or delete it from the index? Recover this file from the index (E) Remove this file (R) from the index and ignore it. as shown…
-
Post Views: 17 1. View the directory structure in GitLab, there are directories: ThemeStoreDB, TheMeStoreDB, this is because the directory ThemeStoreDB is renamed to ThemeStoreDb, and the old-based The code of ThemeStoreDB is caused by the code. as shown in Figure 1 2. On the disk of the local Windows 10, only the directory ThemeStoreDB exists. After the code is…
-
Post Views: 18 1. When pushing to github in TortoiseGit, an error is reported: Fatal: Unable to accesshttps://github.com/shuijingwan/refactoring.git/: Failed to connect to github.com port 443 after 21049 MS: timed out. as shown in Figure 1 2. In the push interface, uncheck the automatic Putty key (A). as shown in Figure 2 3. When pushing, no more errors are reported. as…
-
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: 16 1. In the Git-based operation, branch A is behind B, and A will advance to B quickly. Click the button to start (fast forward). as shown in Figure 1 2. When changing the base again, it prompts: no need to change the base, A is equivalent to B. as shown in Figure 2 3. Check the git…
-
Post Views: 63 1. Execute the command: git pull origin feature/theme-store –rebase, use the base operation 2. Run git stash push, storage and modification. 3. Execute the base command again 4. Run git stash pop to apply the storage and immediately throw it away from the stack. There is a conflict between the merge code. 5. In TortoiseGit, git submits,…