Patent ID: 8868524
Filing Date: 2014-10-21
Classification: G06F

Abstract:
1. A method of merging different versions of a file within a software development system, said method comprising: within a first window, presenting at least one graphic object, wherein each graphic object is associated with one difference between a portion of code of a base version of the file and a portion of code of at least one contributor version of the file; receiving a user selection of the at least one graphic object; responsive to the user selection of the graphic object, displaying a floating window having a first section and at least a second section, wherein the first section consists of the portion of code of the base version of the file and the second section consists of the portion of code of the at least one contributor version of the file, wherein the first and second sections of the floating window are selectable; receiving a user selection of one of the sections of the floating window; and responsive to the user selection of one of the sections of the floating window, including the portion of code of the version of the file of the selected section within a merge file in lieu of the portion of code of the version of the file not selected.