The patent badge is an abbreviated version of the USPTO patent document. The patent badge does contain a link to the full patent document.

The patent badge is an abbreviated version of the USPTO patent document. The patent badge covers the following: Patent number, Date patent was issued, Date patent was filed, Title of the patent, Applicant, Inventor, Assignee, Attorney firm, Primary examiner, Assistant examiner, CPCs, and Abstract. The patent badge does contain a link to the full patent document (in Adobe Acrobat format, aka pdf). To download or print any patent click here.

Date of Patent:
Feb. 26, 2013

Filed:

Jun. 23, 2009
Applicants:

Kim Letkeman, Nepean, CA;

Geoffrey M Clemm, Concord, MA (US);

Scot a Aurenz, Nashua, NH (US);

Inventors:

Kim Letkeman, Nepean, CA;

Geoffrey M Clemm, Concord, MA (US);

Scot A Aurenz, Nashua, NH (US);

Attorney:
Primary Examiner:
Assistant Examiner:
Int. Cl.
CPC ...
G06F 17/00 (2006.01);
U.S. Cl.
CPC ...
Abstract

A system includes a display, a processor executing an application program for displaying an annotation file, and memory storing program instructions of the application program. The processor associates an annotation with a programming module of a baseline file to display, in an unsegmented window of a graphical user interface, the baseline file as a hierarchical structure having nodes. Each node represents a programming module of the baseline file. Displayed is an annotation in the unsegmented window of the GUI proximate to the node that represents the programming module with which the annotation is associated. The displayed annotation includes selectable messages displayed proximate to each other to facilitate visual comparison. Each selectable message describes a modification made to the baseline file by a different contributor. The annotation indicates that the modifications produce a conflict. The conflict is resolvable within the unsegmented window by a selection of one of the selectable messages.


Find Patent Forward Citations

Loading…