Method for presenting associated conflict block and device
US12118336B2 · kind B2 · utility
Assignee
Inventors
Key dates
| Filing date | Jun 29, 2022 |
| Grant date | Oct 15, 2024 |
| Priority date | — |
| Expiry date | Dec 3, 2042 |
Classification
- Technology area (CPC G)Physics
- CPC primaryG06F11/3604
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
A method for presenting an associated conflict block comprises obtaining a first conflict file comprising a plurality of first code blocks, wherein a second code block of the first code blocks comprises a first code snippet of a current version of the second code block, a second code snippet of a basic version of the second code block, and a third code snippet of a to-be-merged version of the second code block. A first instruction triggered on a user interface for activating a to-be-processed code block is received, wherein a first type of the to-be-processed code block is of an unresolved conflict block or a single-side change block. A fourth code snippet comprised in the to-be-processed code block and indexes of N associated code blocks of the to-be-processed code block is presented on the user interface.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.