![]() ![]() Let's see how SemanticMerge detects the conflict:Īs you can see, the tool only detects 1 conflict (try to do the same with a conventional text-based merge tool and you'll enter into nightmare mode). While "Destination contributor" would get the Send() modified inside the renamed (and moved) DNS class: The "Source contributor" would modify Send() on its final location inside ClientSocket. What if the two developers decide to modify the Send() method? Let's consider again the scenario of the Socket class that is split into three classes.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |