Pending merge conflict notification

A method for use with a first client computing device, the method comprising:

• displaying a graphical user interface (GUI) of a distributed source code authoring management system client;
• receiving a first edit to a code file in an editor window included in the GUI, the editor window configured to provide real-time mark-up of the code file;
• in response to the first edit, transmitting change set information including the first edit to a codebase host server, wherein the change set information further includes a first device identifier to which the first edit by the first client computing device is attributed and a first edit timestamp associated with the first edit;
• receiving, from the codebase host server, a first conflict notification indicating that the first edit attributed to the first device identifier and at least a second edit to the code file having a second edit timestamp and attributed to a second device identifier by a second client computing device have a pending merge conflict;
• and
• outputting the first conflict notification for display in the editor window as the real-time mark-up of the code file, the first conflict notification indicating at least a portion of the first edit attributed to the first device identifier and at least a portion of the second edit attributed to the second device identifier in conflict with each other,
• wherein the second edit to the code file is indicated in the first conflict notification as having been performed at the second client computing device at a time indicated by the second edit timestamp,
• wherein the first conflict notification further includes an option to transmit a second conflict notification to the second client computing device, and
• wherein the second conflict notification includes a common code instruction indication that indicates one or more code instructions at which the first edit and the second edit intersect, the first edit timestamp, the second edit timestamp, and the first device identifier.

A first client computing device comprising a processor configured to:

• receive a first edit to a code file, wherein the first edit to the code file is to a first set of one or more code instructions;
• transmit change set information including the first edit to a second client computing device, wherein the change set information further includes a first device identifier to which the first edit by the first client computing device is attributed and a first edit timestamp associated with the first edit;
• receive, from the second client computing device, a first conflict notification indicating that the first edit attributed to the first device identifier and at least a second edit to the code file having a second edit timestamp and attributed to a second device identifier by the second client computing device have a pending merge conflict, wherein:
• the second edit to the code file is to a second set of one or more code instructions;
• and
• the first conflict notification includes an indication of at least one common code instruction included in the first set of one or more code instructions and the second set of one or more code instructions, wherein the at least one common code instruction includes at least a portion of the first edit attributed to the first device identifier and at least a portion of the second edit attributed to the second device identifier in conflict with each other;
• and
• output the first conflict notification,
• wherein the second edit to the code file is indicated in the first conflict notification as having been performed at the second client computing device at a time indicated by the second edit timestamp,
• wherein the first conflict notification further includes an option to transmit a second conflict notification to the second client computing device, and
• wherein the second conflict notification includes a common code instruction indication that indicates one or more code instructions at which the first edit and the second edit intersect, the first edit timestamp, the second edit timestamp, and the first device identifier.