top button
Flag Notify
    Connect to us
      Facebook Login
      Site Registration Why to Join

Facebook Login
Site Registration
Print Preview

Remote branch can not be resolved as commit?

0 votes

I am trying to setup a repository for use inside the LAN, but I have been unable to checkout any branch so far. I am very new to git.

The repository is being served from gitblit over https. I have GIT_SSL_NO_VERIFY=true. The repository was created from git svn.

git ls-remote

shows the remote branches, e.g.:

... refs/remotes/2.0.3
... refs/remotes/trunk

git branch -r

shows none of the remote branches.

git checkout -b new-2.0.3 origin/2.0.3


fatal: git checkout: updating paths is incompatible with switching branches.
Did you intend to checkout 'origin/2.0.3' which can not be resolved as

What does that mean? I get the same result after each of these:

git fetch    
git remote update
git fetch

git add remote stage-repo
git fetch stage-repo
git checkout -b new-2.0.3 stage-repo/2.0.3

Can someone explain what the error message means, and what I am doing wrong?

posted May 22, 2013 by anonymous

Share this question
Facebook Share Button Twitter Share Button Google+ Share Button LinkedIn Share Button Multiple Social Share Button

1 Answer

0 votes
answer May 23, 2013 by Salil Agrawal
Similar Questions
0 votes

After I resolved conflict, how can I do commit by using ".git/MERGE_MSG" without editor ?

I did like below but It didn't work.

$ cat .git/MERGE_MSG | git commit -m 

Is there any way?

0 votes

How to list all the branch that contains commit title is "xxxx yyyy" note: the commit-id is not the same though
the commit content is the same in different branch

+1 vote

I have many commits: A, B, C, ..., Z. I plan to do some housekeeping using rebase. One thing I want to do is to reorder Z to be the first commit. However, other commits will be in conflict with Z's changes. I know I can go through and interactively resolve the conflicts manually. But this is tedious and error prone. I would like to be able to mark Z's changes as authoritative while rebasing. That is, I want to tell git, "whenever a commit conflicts with Z (during this rebase operation) I want you to keep Z's changes and ignore the other." Is this possible? Is there another (hopefully better) way to accomplish what I'm trying to do?

+5 votes

basically, I've got clones of some expensive-to-build projects (node.js), and I have changes that I want to rebase/cherry-pick onto dev and stable branches.

I know I can push to a remote, then pull into my other, and keep the two on different branches so the builds don't get out of date. But, I think I'd like it if they all just shared the same objects, branches, etc...

Could I symlink together my .git{branches,config,hoks,logs,objects,packed-refs,refs} directories? Is this just going to kill me later?

Useful Links with Similar Problem
Contact Us
+91 9880187415
#470/147, 3rd Floor, 5th Main,
HSR Layout Sector 7,
Bangalore - 560102,
Karnataka INDIA.