Tag: rebase
-
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,…
-
Post Views: 16 1. After the Git branch – after transformation, there are 2 submissions that are duplicated. as shown in Figure 1 2. Reset the version to the last submission today, as shown in Figure 2 3. Reset type: hard reset. 4. The local repository has been reset to the last commit today. 2 submissions will not be repeated.…