Hi, Not sure if this is the correct forum for this, but I didn't see one for general issues.
Anyway, I have a repository setup and I am using TortoiseHG to manage it. The problem I have is when it comes to merging files. If I make changes to a file, and someone else makes changes to the same file, how do we go about merging them into 1 file?
And for instance, what if one of the people working on the files deleted some lines of code, but the other guy did not delete those lines of code, which one would get preference?
Does anyone have any knowledge of TortoiseHG/Mercurial and can tell me if this is possible? And if it is, how to do it?
At the moment we are having to make the changes ourselves.(One guy commits, and the other guy pulls that from the repo and merges it by hand which imo completely negates the usefulness of version control)
Thanks