Mercurial Merge
There are times when you will see some more difficult to resolve Mercurial conflicts, perhaps with extra branches in Tortoise. This usually comes about because a developer forgot to pull the most recent code before pushing a recent check in. For instance, the .hgtags file which tracks build numbers will be out of sync because […]