Reducing merge conflicts in a development environment

A computer system for reducing merge conflicts in an integrated development environment, the computer system comprising:

• one or more computer processors;
• one or more computer-readable storage media;
• program instructions stored on the computer-readable storage media for execution by at least one of the one or more processors, the program instructions comprising:
• program instructions to receive computer code within an integrated development environment that includes a plurality of line edits authored by a plurality of developers;
• program instructions to receive development activity information associated with the computer code describing the nature of the plurality of line edits;
• program instructions to display in real-time the computer code in a manner that includes program instructions to distinguish the plurality of line edits based the development activity information;
• and
• program instructions to dictate an editing activity of the computer code based on the development activity information.

A computer program product for reducing merge conflicts in an integrated development environment, the computer program product comprising:

• one or more computer-readable storage media and program instructions stored on the one or more computer-readable storage media, the program instructions comprising:
• program instructions to receive computer code within an integrated development environment that includes a plurality of line edits authored by a plurality of developers;
• program instructions to receive development activity information associated with the computer code describing the nature of the plurality of line edits;
• program instructions to display in real-time the computer code in a manner that includes program instructions to distinguish the plurality of line edits based the development activity information;
• and
• program instructions to dictate an editing activity of the computer code based on the development activity information.