[pony-build] Problems with build-nose (was: reminder: blog posts etc.)

[Khushboo Shakya]

Hello Titus,

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.

Thanks

Khushboo

On Sat, Feb 13, 2010 at 1:03 AM, C. Titus Brown <ctb at msu.edu> wrote:

> On Sat, Feb 13, 2010 at 12:56:28AM -0600, Khushboo Shakya wrote:
> > I tried running the build-nose in my own computer after correcting the
> code
> > in the pony_client, I still got the assertion error. I pushed my code to
> > github but got another error : conflicted merging. If anybody encountered
> > the same problem in the past and know how to fix it, would be great.
>
> Hi Khushboo,
>
> first, please remember to change the subject line if you're changing the
> topic
> of an e-mail thread (or just send a new post) -- some of us get waaaaaay
> too
> much e-mail and rely on subjects to figure out what's what!
>
> second, could you try doing this:
>
>   git push <your github address> master:nose_problems
>
> This will push your master branch to the 'nose_problems' branch on
> github, avoiding any merge problems.  Then we can take a look at it.
>
> cheers,
> --titus
> --
> C. Titus Brown, ctb at msu.edu
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.idyll.org/pipermail/pony-build/attachments/20100213/fefed1fd/attachment.htm>