[pony-build] Problems pulling from github

[C. Titus Brown]

On Sun, Mar 07, 2010 at 11:47:22PM -0600, Khushboo Shakya wrote:
> 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.

Do a 'git commit -am' to commit changes to the branch.

'push' communicates committed changes; 'commit' records the changes as
intentional.

confused yet? ;)

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

Ahh, yes, good point -- mine :)

--titus