git-pull

问题 I thought git pull was like a git fetch + git merge. Being in branchA, I always do a git fetch and then a git merge origin/master. But today, being in a branchA, I tried git pull origin/master and it didn't work but doing a git pull origin master worked. Any thoughts? Extra question, if an updated origin/master and the online version of master are the same, why bother to have origin/master, wouldn't it be more convenient to always work with the online version that is always updated, releasing

问题 In case of a git-project with several branches, the question is when you checkout a new branch (first time), is a git pull needed ? $master> git checkout branchA $branchA> git pull Note that the idea here is that both commands are executed right after each other (this question is not about when-or-why you should run git pull ) I've tested this, but so far the pull doesn't pull in new commits, but some people claim that the pull is needed. Can someone describe a scenario in which this is

问题 In case of a git-project with several branches, the question is when you checkout a new branch (first time), is a git pull needed ? $master> git checkout branchA $branchA> git pull Note that the idea here is that both commands are executed right after each other (this question is not about when-or-why you should run git pull ) I've tested this, but so far the pull doesn't pull in new commits, but some people claim that the pull is needed. Can someone describe a scenario in which this is

问题 I made a mistake: I should have used git pull --rebase , but I issued a simple git pull , merged everything and now have a merge commit at the HEAD of my branch. I want to get rid of that merge commit and I thought I'd just issue a git rebase -i HEAD~3 , move my last local commit to the top and squash the merge commit into it. Alas, the merge commit is not available for squashing. If I do this, I get into intermediate states where I need to do the merge again, which is a lot of work. Is there

问题 I made a mistake: I should have used git pull --rebase , but I issued a simple git pull , merged everything and now have a merge commit at the HEAD of my branch. I want to get rid of that merge commit and I thought I'd just issue a git rebase -i HEAD~3 , move my last local commit to the top and squash the merge commit into it. Alas, the merge commit is not available for squashing. If I do this, I get into intermediate states where I need to do the merge again, which is a lot of work. Is there

问题 I made a mistake: I should have used git pull --rebase , but I issued a simple git pull , merged everything and now have a merge commit at the HEAD of my branch. I want to get rid of that merge commit and I thought I'd just issue a git rebase -i HEAD~3 , move my last local commit to the top and squash the merge commit into it. Alas, the merge commit is not available for squashing. If I do this, I get into intermediate states where I need to do the merge again, which is a lot of work. Is there

问题 I made a mistake: I should have used git pull --rebase , but I issued a simple git pull , merged everything and now have a merge commit at the HEAD of my branch. I want to get rid of that merge commit and I thought I'd just issue a git rebase -i HEAD~3 , move my last local commit to the top and squash the merge commit into it. Alas, the merge commit is not available for squashing. If I do this, I get into intermediate states where I need to do the merge again, which is a lot of work. Is there

问题 I have read the question (and answer) of this StackOverflow item and it does not help because it is related to Windows OS. I have Xubuntu. I recently passed Xubuntu from 16.04 to 20.04 (I do not really know if this can generate the error). However, a simple command like: git pull generates the following errors (all similar among them): error: unable to create file Template/images/N<X.pdf: Invalid argument ... I guess because there are special characters in some of the files (specifically the

问题 I am facing a problem with a Git repository stored on GitLab. It seems to be a repository issue only affecting this specific repository, as all other projects hosted on GitLab are working fine. It seems I can personally push, pull, and checkout branches using GitKraken, but when I try to pull from Git Bash I get the following: $ git pull Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. error: Could not read

问题 I commited a new feature locally, pulled from remote and got merge conflicts. After resolving them, my feature stopped working. I assumed that I made an error and asked a question about this yesterday. So I did a hard reset to my previous commit, repeated the merge and resolved the conflicts I was shown. But again, my feature stopped working. I looked through the code manually and saw that part of the code of my local commit was changed by the pull but no merge conflict had been displayed for