== Advanced ObjectInfo == This is an advanced merge scenario. You won't be able to solve this merge using a regular text-based merge tool. You would need to rewrite the file entirely. It is also a complex scenario to solve with SemanticMerge. But, since Semantic detects the real structure changes it helps a lot to solve the conflicts. These are the changes done by the two developers concurrently: * Developer 1 performs the following changes: * Moves the ObjectInfo class (1) to namespace Codice.Common.InRep (B). * Renames the namespace Codice.Common.InRep (B) to namespace Codice.Common.Rep (C) * Deletes the namespace Codice.CM.Common (A). * Developer 2: * Adds a new namespace Codice.Common.Rep (C). * Moves the RepositoryServerInfo class (2) to namespace Codice.Common.Rep (C). * Deletes the namespace Codice.CM.Common (A).