Category: TortoiseGit
-
Post Views: 17 1. When pushing based on TortoiseGit, prompt: The input source reference is not clear, as shown in Figure 1 2. Analyze the reason, it is that there are branches and labels with the same name at the same time, the name is: fixbug-1.3.26-alpha.3, as shown in Figure 2 3. According to the prompt, add refs/heads/ as the…
-
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…
-
Post Views: 14 1. In the submission of a developer, there is a conflicting file, and the conflict is forced to submit, as shown in Figure 1 2. Decide to delete several possible conflicting files to delete, and reset the version to the latest valid submission, as shown in Figure 2 3. Select hard reset, and discard all subsequent commits…
-
Post Views: 14 1. shuijingwan/yii2-app-advanced (github), as shown in Figure 1 (1) Project maintainer: wangqiang (2) Public warehouse:https://github.com/shuijingwan/yii2-app-advanced.git (3) Visible grade of public warehouse: public (4) The maintainer clones from the public warehouse, and performs pull and push in his own local repository (github-shuijingwan-yii2-app-advanced). (5) Branch: long-term branch: master; short-term branch: function (feature) branch, pre-release (release) branch, patch bug (fixbug)…
-
Post Views: 12 1. Execute the command: git pull –progress –no-rebase -v “origin”, report an error, as shown in Figure 1 Fatal: Unable to accesshttps://github.com/shuijingwan/yii2-starter-kit.git/: Unknown SSL protocol error in connection to github.com:443 2. Decided to use ssh to connect, since both git bash and tortoisegit are possible, use the puttygen tool that comes with TortoiseGit to generate the key,…