[Answer]-Hg mercurial – how to merge in 3 way merge window in shell

If you don’t have any differences between your production and development script that should be merged, it is safe to always do update clean with update -C. This will replace all local changes you made with the latest version that you pulled from the repository. So the workflow would be:

hg pull
hg update -C