Invention Grant
- Patent Title: Reducing merge conflicts in a development environment
- Patent Title (中): 减少开发环境中的合并冲突
-
Application No.: US13724043Application Date: 2012-12-21
-
Publication No.: US09086885B2Publication Date: 2015-07-21
- Inventor: Alexander J. Canter , Taylor N. Clark , Jonathan Goldszmidt , Kelvin R. Lawrence
- Applicant: International Business Machines Corporation
- Applicant Address: US NY Armonk
- Assignee: International Business Machines Corporation
- Current Assignee: International Business Machines Corporation
- Current Assignee Address: US NY Armonk
- Agent David B. Woycechowsky; Trentice V. Bolar; Steven L. Bennett
- Main IPC: G06F9/44
- IPC: G06F9/44

Abstract:
Embodiments of the present invention provide a system, method, and program product to reduce merge conflicts in an integrated development environment. The present invention includes a computer that receives computer code that includes a plurality of line edits authored by a plurality of developers and development activity information associated with the computer code describing the nature of the plurality of line edits. The computer displays in real-time the computer code in a manner that includes distinguishing the plurality of line edits based the development activity information. Furthermore, the computer dictates an editing activity of the computer code based on the development activity information. Furthermore, the present invention executes within an integrated development environment.
Public/Granted literature
- US20140181789A1 REDUCING MERGE CONFLICTS IN A DEVELOPMENT ENVIRONMENT Public/Granted day:2014-06-26
Information query