Wait a second. I got exactly the same conflicts now.
I can't guess what happened. Had to reset --hard to origin/master to avoid
merging everything. Did someone did a --forced push?

On Mon, Sep 29, 2008 at 17:43, Mislav Marohnić <[EMAIL PROTECTED]>wrote:

> 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.

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 

Reply via email to