Hello Titus,<br><br>I have pushed the code to github to the nose_problems branch. However I still don't see in github. It does show in my computer that the file has been pushed though.<br><br>Thanks<br><br>Khushboo<br>
<br><div class="gmail_quote">On Sat, Feb 13, 2010 at 1:03 AM, C. Titus Brown <span dir="ltr"><<a href="mailto:ctb@msu.edu">ctb@msu.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
On Sat, Feb 13, 2010 at 12:56:28AM -0600, Khushboo Shakya wrote:<br>
> I tried running the build-nose in my own computer after correcting the code<br>
> in the pony_client, I still got the assertion error. I pushed my code to<br>
> github but got another error : conflicted merging. If anybody encountered<br>
> the same problem in the past and know how to fix it, would be great.<br>
<br>
Hi Khushboo,<br>
<br>
first, please remember to change the subject line if you're changing the topic<br>
of an e-mail thread (or just send a new post) -- some of us get waaaaaay too<br>
much e-mail and rely on subjects to figure out what's what!<br>
<br>
second, could you try doing this:<br>
<br>
git push <your github address> master:nose_problems<br>
<br>
This will push your master branch to the 'nose_problems' branch on<br>
github, avoiding any merge problems. Then we can take a look at it.<br>
<br>
cheers,<br>
--titus<br>
<font color="#888888">--<br>
C. Titus Brown, <a href="mailto:ctb@msu.edu">ctb@msu.edu</a><br>
</font></blockquote></div><br>