Patent ID: 8826222
Filing Date: 2014-09-02
Classification: G06F,G06Q

Abstract:
1. A method comprising: identifying, by a computer system responsive to an action of a first of a plurality of developers, a portion of interest to the first developer in revision-controlled base source code stored in a source-code repository, the base source code being developed by the plurality of developers; monitoring, by the computer system, a source of information generated in response to changes to respective copies of the base source code made by any of the plurality of developers to determine whether the generated information indicates that any change has been made to the portion of interest by any of the plurality of developers; and in response to a determination, from the monitoring of the source of information, that a second one of the plurality of developers has made a change to the portion of interest in a first copy of the base source code and has not yet committed the first copy to the source-code repository, producing a notification of a potential merge conflict due to the change to the portion of interest and providing the notification for the first developer, wherein the action of the first developer comprises the first developer annotating a second copy of the base source code with delimiters that mark a beginning and an end of the portion of interest and adding, to the second copy of the base source code, content to the included in the notification.