Merge previewing in a version control system
US9430229B1 · kind B1 · utility
Assignee
Inventors
Key dates
| Filing date | Mar 14, 2014 |
| Grant date | Aug 30, 2016 |
| Priority date | — |
| Expiry date | Aug 26, 2034 |
Classification
- Technology area (CPC G)Physics
- CPC primaryG06F9/3844
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
In an embodiment, a data processing system comprises one or more processors; one or more non-transitory computer-readable storage media storing sequences of instructions which, when executed by the one or more processors, cause the processor to perform: in a computer program source code version control system, obtaining input specifying a source branch of computer program source code, a destination branch of computer program source code, and an upstream repository of computer program source code relating to a prospective merge of the source branch into the destination branch in the upstream repository; performing, in a temporary data storage location, a merge of the source branch and destination branch with respect to a first parent branch of the source branch and destination branch; creating and causing displaying a diff of the source branch with respect to the first parent branch; in the diff, displaying one or more conflicts of the source branch and the destination branch that would occur if the merge is committed to the repository.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.