[pony-build] Problems pulling from github

Khushboo Shakya khusuz at gmail.com
Sun Mar 7 21:47:22 PST 2010


For some reason it would not let me do a git checkout to switch to different
branch. I was in mkdir and wanted to delete the branch so I tried doing git
checkout master but it would not let me do it so I created a new branch and
testbranch and switched. So now mkdir is gone. But I try switching back to
master, it does not work.

Khushboo at KHUSHBOO-PC ~/Desktop/pony-build1/client (testbranch)
$ git branch
  master
* testbranch

Khushboo at KHUSHBOO-PC ~/Desktop/pony-build1/client (testbranch)
$ git checkout master
error: You have local changes to 'client/pony_client.py'; cannot switch
branches
.

It says that I have changes in local branch. I tried pushing it but that
does not work either.


Khushboo at KHUSHBOO-PC ~/Desktop/pony-build1/client (testbranch)
$ git push git at github.com:kshakya/pony-build.git :master
error: refusing to delete the current branch: refs/heads/master
To git at github.com:kshakya/pony-build.git
 ! [remote rejected] master (deletion of the current branch prohibited)
error: failed to push some refs to 'git at github.com:kshakya/pony-build.git'

Another question with the fetch command. When  you are saying origin is it
your repo url or mine in the fetch command?

Thanks

Khushboo

On Sun, Mar 7, 2010 at 11:09 PM, C. Titus Brown <ctb at msu.edu> wrote:

> On Sun, Mar 07, 2010 at 11:06:37PM -0600, Khushboo Shakya wrote:
> > Hello again,
> >
> > Well I thought that the problem that I was having was that I didn't have
> the
> > updated version of pony_client. So I was trying to pull from your repo.
> But
> > I came across all different problems so I thought of just copy pasting
> your
> > pony_client.Not sure if that will work but now I have a different error.
> >
> > Khushboo at KHUSHBOO-PC ~/Desktop/pony-build1/client (mkdir)
>
> Two things are likely to be going wrong:
>
> Make sure you're in branch 'master'; do a 'git checkout master'.  The
> 'mkdir'
> branch is obsolete and broken (which is the problem you're running into
> below).
>
> Also, make sure you've run the 'git fetch' at the bottom of this:
>
> http://lists.idyll.org/pipermail/pony-build/2010-February/000107.html
>
> cheers,
> --titus
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.idyll.org/pipermail/pony-build/attachments/20100307/621cfe52/attachment.htm>


More information about the pony-build mailing list