Error 255

126 views

Skip to first unread message

Adam Karger

unread,

Jun 21, 2011, 4:35:57 PM6/21/11

to MacHg

I am trying to Update my assets folder and keep receiving the
following message,

Mercurial reported error number 255:
abort: outstanding uncommitted merges

I have not been able to merge my assets folder with bitbucket and not
sure how to fix this?

Any help would be appreciated,

Adam

Jason Harris

unread,

Jun 24, 2011, 12:20:55 AM6/24/11

to machg_m...@googlegroups.com

On Jun 22, 2011, at 8:35 AM, Adam Karger wrote:

> I am trying to Update my assets folder and keep receiving the
> following message,
>
> Mercurial reported error number 255:
> abort: outstanding uncommitted merges
>
> I have not been able to merge my assets folder with bitbucket and not
> sure how to fix this?

You can do a clean update to the top version and will erase all outstanding changes... Be sure this is what you want before you do it. (Maybe make a finder backup of the entire folder first just to be on the safe side...)