Collaborative software development tool for resolving potential code-change conflicts in real time

摘要

According to one or more embodiments of the present invention, a computer-implemented method includes uploading, by a first instance of an integrated development environment (IDE), a first source-code change to a change log of a version control system. A second instance of the IDE is used to upload a second source-code change to the change log of the version control system. A determination is made that the second source-code change conflicts with the first source-code change. Based on the determination that the second source-code change conflicts with the first source-code change, generating a notification of the second source-code change is generated in the first instance of the IDE.