Hey Richard,
The log says there were conflicting merges, which couldn't happen unless you
commited to your local repo or applied some patches. Maybe your working copy
was simply checked out in a branch other than master? When running git pull
from upstream, it's important that you are currently on master.


On Mon, Sep 29, 2008 at 11:51, Richard Quadling <[EMAIL PROTECTED]>wrote:

>
> Hi.
>
> Just got notified of a new version of Prototype by UpdateScout.

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Prototype: Core" group.
To post to this group, send email to prototype-core@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/prototype-core?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to