Pending merge conflict notification
US10592234B2 · kind B2 · utility
Assignee
Inventors
Key dates
| Filing date | May 2, 2018 |
| Grant date | Mar 17, 2020 |
| Priority date | — |
| Expiry date | May 2, 2038 |
Classification
- Technology area (CPC G)Physics
- CPC primaryG06F11/3624
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
A first client computing device, including a display and a processor. The processor may execute a distributed source code authoring management system client configured to communicate with a codebase host server. The processor may output a graphical user interface (GUI) of the distributed source code authoring management system client and may receive a first edit to a code file in an editor window included in the GUI. The editor window may provide real-time mark-up of the code file. In response to the first edit, the processor may transmit change set information including the first edit to a codebase host server. The processor may receive, from the codebase host server, a first conflict notification indicating that the first edit and a second edit to the code file have a pending merge conflict. The processor may output the first conflict notification to the display for display in the editor window.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.