CVS uses a simple text-based rule to identify overlaps during a merge: There is an overlap if the same line was changed in both versions that are being merged. If no such line exists, then CVS decides there is no conflict and the versions are merged automatically. For example, assume a file contains a class with three methods, a(), b(), and c(). Two developers work independently on the file. If they both modify the same lines of code, say the first line of method a(), then CVS decides there is a conflict. Explain why this approach will fail to detect certain types of conflict. Provide an example in your answer.
What will be an ideal response?
This approach fails when developers introduce conflicts when modifying different lines of a file. For example, if two
developers introduce a new field with the same name in the same class in different locations in the file. Note that
developers can also introduce semantic conflicts by modifying two different files (e.g., by making different
assumptions about the same class).
You might also like to view...
The ____ is a temporary storage area.
A. Warehouse B. Clipboard C. Storehouse D. Gallery
Which allows you to use a work for any purpose without obtaining permission?
a. Public domain b. Fair usec. Creative Commons
When setting rect value, which sequence is correct?
a. top-left y, bottom-right y, top-left y, bottom-right x b. bottom-right x, bottom-right y, top-left x, top-left y c. top-left y, top-left x, bottom-right x, bottom-right y d. top-left x, top-left y, bottom-right x, bottom-right y
Which of the following tools can you use to identify running processes?
What will be an ideal response?