Streamlined methodology for resolving software integration conflicts
US8683443B2 · kind B2 · utility
Assignee
Inventors
Key dates
| Filing date | Jan 20, 2012 |
| Grant date | Mar 25, 2014 |
| Priority date | — |
| Expiry date | May 18, 2032 |
Classification
- Technology area (CPC G)Physics
- CPC primaryG06F8/71
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
A computer-based system to integrate code changes for a software application is provided. The system detects when a requested code change for a branch of the software application conflicts with another code change, and generates a blocked change notification corresponding to the detected conflict. The blocked change notification includes a blocked change identifier corresponding to the requested code change. The notification is delivered to a user device, which responds with a conflict resolution response that includes at least one code change file associated with the requested code change, along with an integration annotation that conveys the blocked change identifier and a branch name identifier that identifies the branch of the software application. The system acts upon the integration annotation to integrate the at least one code change file into the branch of the software application.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.