Patent ID: 9086885
Filing Date: 2015-07-21
Classification: G06F

Abstract:
1. A method for reducing merge conflicts in an integrated development environment, the method comprising: a computer receiving computer code within an integrated development environment, wherein the computer code includes a plurality of line edits authored by a plurality of developers; the computer receiving development activity information associated with the computer code describing the nature of the plurality of line edits; the computer displaying in real-time the computer code in a manner that includes: (i) distinguishing the plurality of line edits based on the development activity information, and (ii) indicates, on a line edit by line edit basis, one of the following restriction statuses: global, local, or restricted; and the computer dictating an editing activity of the computer code based on the development activity information; and wherein the development activity information includes time/date of a line edit, developer ID information associated with a line edit, a nature of a line edit, and a code status of a line edit.