Mercurial Merging

Hello Friends

I am using TortoiseHG to get the latest updates to nopCommerce's code, however now I have just pulled the latest changes, but it is not merging the changes with my code. I have no idea why.

I get a [ command returned code 255 ] and Googling it did not help.

Anyone have any idea how I can the code merge to go through ? I would greatly appreciate any help.

Thank You.

Hi,

Have you watched this and this screencasts? If yes, then could you please record a new one with your steps so I can understand what you're doing step by step.