Automated modification integration and conflict resolution for software development
US9952833B2 · kind B2 · utility
Assignee
Inventors
Key dates
| Filing date | Aug 26, 2015 |
| Grant date | Apr 24, 2018 |
| Priority date | — |
| Expiry date | Feb 1, 2036 |
Classification
- Technology area (CPC G)Physics
- CPC primaryG06F8/71
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
Proposed changes to a source code generated by client computing devices are integrated with a master version of the code resident on a server computing system remote from the client devices. The client devices connect to the server system over a network and transmit proposed changes to the server system, where resident integration/conflict resolution software automatically integrates the proposed changes into the master version. Any unresolved conflicts remaining after the automatic integration are identified and the server system automatically sends an email notifying the one or more client devices that there are unresolved conflicts. The email includes a link that enables a client device to launch a window on a monitor, and the client device user employs the window to transmit commands directly to and receive further communications directly from the integration/conflict resolution software in an interactive operation to attempt to manually resolve the conflicts.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.