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