Abstract: A first client computing device, including a display and a processor. The processor may execute a distributed source code authoring management system client configured to communicate with a codebase host server. The processor may output a graphical user interface (GUI) of the distributed source code authoring management system client and may receive a first edit to a code file in an editor window included in the GUI. The editor window may provide real-time mark-up of the code file. In response to the first edit, the processor may transmit change set information including the first edit to a codebase host server. The processor may receive, from the codebase host server, a first conflict notification indicating that the first edit and a second edit to the code file have a pending merge conflict. The processor may output the first conflict notification to the display for display in the editor window.

Abstract: A computer device is provided that includes a display and a processor configured to execute an integrated development environment that includes code development tools, output for display on the display an editor window of the integrated development environment configured to present a code file and real-time mark-up of the code file, wherein the editor window includes a difference view mode that causes the editor window to emphasize a difference between the code file and a baseline code file. The processor is further configured to perform a function of one of the code development tools on the code file and present a result of the function in the editor window while in the difference view mode.

Abstract: A first client computing device, including a display and a processor. The processor may execute a distributed source code authoring management system client configured to communicate with a codebase host server. The processor may output a graphical user interface (GUI) of the distributed source code authoring management system client and may receive a first edit to a code file in an editor window included in the GUI. The editor window may provide real-time mark-up of the code file. In response to the first edit, the processor may transmit change set information including the first edit to a codebase host server. The processor may receive, from the codebase host server, a first conflict notification indicating that the first edit and a second edit to the code file have a pending merge conflict. The processor may output the first conflict notification to the display for display in the editor window.

Abstract: A computer device is provided that includes a display and a processor configured to execute an integrated development environment that includes code development tools, output for display on the display an editor window of the integrated development environment configured to present a code file and real-time mark-up of the code file, wherein the editor window includes a difference view mode that causes the editor window to emphasize a difference between the code file and a baseline code file. The processor is further configured to perform a function of one of the code development tools on the code file and present a result of the function in the editor window while in the difference view mode.