The problem can be seen when checking the remote.origin.fetch setting (The lines starting with $ are bash prompts with the commands I typed. The other lines are the resulting output) $ git config –get remote.origin.fetch +refs/heads/master:refs/remotes/origin/master As you can see, in my case, the remote was set to fetch the master branch specifically and only. … Read more
It should be pretty obvious from your question that you’re actually just asking about the difference between git merge and git rebase. So let’s suppose you’re in the common case – you’ve done some work on your master branch, and you pull from origin’s, which also has done some work. After the fetch, things look … Read more
You need to do the following git fetch -p The -p or –prune argument will update the local database of remote branches.
The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to “pull” your system would be forced to overwrite the local files which are not version controlled. Try running git add * git stash git pull This will track all files, remove all of your … Read more
Update: Using Git Switch All of the information written below was accurate, but a new command, git switch has been added that simplifies the effort. If daves_branch exists on the remote repository, but not on your local branch, you can simply type: git switch daves_branch Since you do not have the branch locally, this will … Read more