How to maintain original code with own one?

Hi.
What strategy do you use to keep your own nopcommerce version with the original one in sync?

Is it good idea to make own branch from the nop trunk and merge new versions to it?

I use TortoiseHg. Create your local repository by cloning the main one (https://hg01.codeplex.com/nopcommerce), then work in your local repository. Whenever you make changes, you'll need to commit those changes to the local repository before getting updates from the main repository. When you sync with the main repository, TortoiseHg will show you a windows when there are conflicts that must be resolved. Those can easily be resolved using the Kdiff3 tool included with TortoiseHg.

Here's a good tutorial to get started: http://tortoisehg.bitbucket.org/manual/2.0/quick.html

Excellent, thank you.

Please also have a look at the following topic https://www.nopcommerce.com/boards/t/11806/custom-dev-source-control-changesets-best-practices.aspx