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.

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.

Abstract: Disclosed is a system, method, and program for magnifying displayed content downloaded from a server over a network. Information is received indicating selection of a region of the displayed content to magnify. A determination is made of at least one region of the selected region including image content. The server maintains a high resolution file version and a low resolution file version of the image content. A determination is then made as to whether the selected image content from the displayed image file is the low resolution file version. If so, a command is generated to retrieve from the server specific byte locations from the high resolution file version including the image content in the selected region. The specified bytes are less than all the image data bytes in the high resolution version of the file if the image content in the selected region comprises less than all of the image content maintained in the high resolution version of the file.