1. A computer-based system to integrate code changes associated with a software application having multiple code branches, the system comprising a processor and a memory element to store executable instructions that, when executed by the processor, cause the system to: detect when a requested code change for a branch of the software application conflicts with another code change for the branch of the software application, resulting in a detected conflict; generate a blocked change notification corresponding to the detected conflict, the blocked change notification comprising a blocked change identifier corresponding to the requested code change; initiate delivery of the blocked change notification to a user device; receive, from the user device, a conflict resolution response for the detected conflict, the conflict resolution response comprising at least one code change file associated with the requested code change, and the conflict resolution response comprising an integration annotation that conveys the blocked change identifier and a branch name identifier that identifies the branch of the software application; and act upon the integration annotation to integrate the at least one code change file into the branch of the software application.