Patent ID: 8386919

Claim:
A computer program product for displaying an annotation file, the computer program product comprising: a computer readable storage medium, which is not a signal, having computer readable program code embodied therewith, the computer readable program code comprising: computer readable program code configured to associate an annotation with a programming module of a baseline file; computer readable program code configured to display on a computer in an unsegmented window of a graphical user interface the baseline file in a hierarchical structure having a plurality of nodes, each node representing a programming module of the baseline file; and computer readable program code configured to display the annotation on the computer in the unsegmented window of the graphical user interface proximate to the node that represents the programming module with which the annotation is associated, the annotation including a plurality of selectable messages displayed proximate to each other in order to facilitate visual comparison, each selectable message describing a modification made to the baseline file by a different contributor, the annotation indicating that the modifications produce a conflict, the conflict being resolvable within the unsegmented window by a selection of one of the selectable messages.