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.<div>
<br></div><div><div>Khushboo@KHUSHBOO-PC ~/Desktop/pony-build1/client (testbranch)</div><div>$ git branch</div><div> master</div><div>* testbranch</div><div><br></div><div>Khushboo@KHUSHBOO-PC ~/Desktop/pony-build1/client (testbranch)</div>
<div>$ git checkout master</div><div>error: You have local changes to 'client/pony_client.py'; cannot switch branches</div><div>.</div><div><br></div><div>It says that I have changes in local branch. I tried pushing it but that does not work either.</div>
<div><br></div><div><div><br></div><div>Khushboo@KHUSHBOO-PC ~/Desktop/pony-build1/client (testbranch)</div><div>$ git push git@github.com:kshakya/pony-build.git :master</div><div>error: refusing to delete the current branch: refs/heads/master</div>
<div>To git@github.com:kshakya/pony-build.git</div><div> ! [remote rejected] master (deletion of the current branch prohibited)</div><div>error: failed to push some refs to 'git@github.com:kshakya/pony-build.git'</div>
<div><br></div><div>Another question with the fetch command. When you are saying origin is it your repo url or mine in the fetch command?</div><div><br></div><div>Thanks</div><div><br></div><div>Khushboo</div></div><br><div class="gmail_quote">
On Sun, Mar 7, 2010 at 11:09 PM, C. Titus Brown <span dir="ltr"><<a href="mailto:ctb@msu.edu">ctb@msu.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="im">On Sun, Mar 07, 2010 at 11:06:37PM -0600, Khushboo Shakya wrote:<br>
> Hello again,<br>
><br>
> Well I thought that the problem that I was having was that I didn't have the<br>
> updated version of pony_client. So I was trying to pull from your repo. But<br>
> I came across all different problems so I thought of just copy pasting your<br>
> pony_client.Not sure if that will work but now I have a different error.<br>
><br>
> Khushboo@KHUSHBOO-PC ~/Desktop/pony-build1/client (mkdir)<br>
<br>
</div>Two things are likely to be going wrong:<br>
<br>
Make sure you're in branch 'master'; do a 'git checkout master'. The 'mkdir'<br>
branch is obsolete and broken (which is the problem you're running into below).<br>
<br>
Also, make sure you've run the 'git fetch' at the bottom of this:<br>
<div class="im"><br>
<a href="http://lists.idyll.org/pipermail/pony-build/2010-February/000107.html" target="_blank">http://lists.idyll.org/pipermail/pony-build/2010-February/000107.html</a><br>
<br>
</div>cheers,<br>
<font color="#888888">--titus<br>
</font></blockquote></div><br></div>