"Cannot update paths and switch to branch at the same time"
GitGit CheckoutGit Problem Overview
I sometimes use the checkout -b
option to create a new branch, check it out at the same time and set up tracking in one command.
In a new environment, I get this error:
$ git checkout -b test --track origin/master
fatal: Cannot update paths and switch to branch 'test' at the same time.
Did you intend to checkout 'origin/master' which can not be resolved as commit?
Why does Git not like it? This used to work with the same repo.
Git Solutions
Solution 1 - Git
> 'origin/master
' which can not be resolved as commit
Strange: you need to check your remotes:
git remote -v
And make sure origin
is fetched:
git fetch origin
Then:
git branch -avv
(to see if you do have fetched an origin/master
branch)
Finally, use git switch
instead of the confusing git checkout
, with Git 2.23+ (August 2019).
git switch -c test --track origin/master
Solution 2 - Git
If you have a typo in your branchname you'll get this same error.
Solution 3 - Git
You can get this error in the context of, e.g. a Travis build that, by default, checks code out with git clone --depth=50 --branch=master
. To the best of my knowledge, you can control --depth
via .travis.yml
but not the --branch
. Since that results in only a single branch being tracked by the remote, you need to independently update the remote to track the desired remote's refs.
Before:
$ git branch -a
* master
remotes/origin/HEAD -> origin/master
remotes/origin/master
The fix:
$ git remote set-branches --add origin branch-1
$ git remote set-branches --add origin branch-2
$ git fetch
After:
$ git branch -a
* master
remotes/origin/HEAD -> origin/master
remotes/origin/branch-1
remotes/origin/branch-2
remotes/origin/master
Solution 4 - Git
This simple thing worked for me!
If it says it can't do 2 things at same time, separate them.
git branch branch_name origin/branch_name
git checkout branch_name
Solution 5 - Git
You could follow these steps when you stumble upon this issue:
- Run the following command to list the branches known for your local repository.
> git remote show origin
which outputs this:
> remote origin
> Fetch URL:
- After verifying the details like (fetch URL, etc), run this command to fetch any new branch(i.e. which you may want to checkout in your local repo) that exist in the remote but not in your local.
> » git remote update > > Fetching origin > From gitlab.domain.local:ProjectGroupName/ProjectName > * [new branch] Feature3 -> Feature3
As you can see the new branch has been fetched from remote.
3. Finally, checkout the branch with this command
> » git checkout -b Feature3 origin/Feature3 > > Branch Feature3 set up to track remote branch Feature3 from origin. > Switched to a new branch 'Feature3'
It is not necessary to explicitly tell Git to track(using --track) the branch with remote.
The above command will set the local branch to track the remote branch from origin.
Solution 6 - Git
If you got white space in your branch then you will get this error.
Solution 7 - Git
It causes by that your local branch doesn't track remote branch. As ssasi said,you need use these commands:
git remote update
git fetch
git checkout -b branch_nameA origin/branch_nameB
I solved my problem just now....
Solution 8 - Git
In my case, I had to update my local git repository with latest tags from remote repository using below command:
git fetch --tags
The command to fetch remote repository tags may differ based on your organization's Git setup.
After doing this, git checkout
worked.
Solution 9 - Git
For me I needed to add the remote:
git remote -add myRemoteName('origin' in your case) remoteGitURL
then I could fetch
git fetch myRemoteName
Solution 10 - Git
First you need to Fetch
the remote (the specific branch), then you can create a local br and track it with that remote branch using your command (i.e. checkout
with -b and --track).
Solution 11 - Git
You should go the submodule dir and run git status
.
You may see a lot of files were deleted. You may run
-
git reset .
-
git checkout .
-
git fetch -p
-
git rm --cached submodules
//submoudles is your name -
git submoudle add ....
Solution 12 - Git
You can use these commands: git remote update, git fetch, git checkout -b branch_nameA origin:branch_nameB
I think maybe it's because of your local branch can not track remote branch
Solution 13 - Git
First You need check your remote : It should be *master
git pull (up-to-date)
git checkout -b branch-name (branch name without any spaces)
git status
git add .
git commit -m "comments goes here"
git push branch-name