The patent badge is an abbreviated version of the USPTO patent document. The patent badge does contain a link to the full patent document.

The patent badge is an abbreviated version of the USPTO patent document. The patent badge covers the following: Patent number, Date patent was issued, Date patent was filed, Title of the patent, Applicant, Inventor, Assignee, Attorney firm, Primary examiner, Assistant examiner, CPCs, and Abstract. The patent badge does contain a link to the full patent document (in Adobe Acrobat format, aka pdf). To download or print any patent click here.

Date of Patent:
Nov. 15, 2022

Filed:

Jan. 22, 2021
Applicant:

Microsoft Technology Licensing, Llc, Redmond, WA (US);

Inventors:

Nathan Cole Owen, Seattle, WA (US);

Deepraj Dixit, Hyderabad, IN;

Manni Arora, Sonipat, IN;

Harsh Sharma, Bhopal, IN;

Assignee:
Attorney:
Primary Examiner:
Int. Cl.
CPC ...
G06F 8/65 (2018.01); G06F 8/71 (2018.01);
U.S. Cl.
CPC ...
G06F 8/65 (2013.01); G06F 8/71 (2013.01);
Abstract

A system for safely reverting merges across branches in version control systems where shared history cannot be rewritten is described. A computer-implemented method, comprising: identifying a first merge base at a trunk, the first merge base merging with a branch of the trunk; identifying, at the branch, a second merge base, subsequent to the first merge base, the second merge base merging with the trunk; forming a merge base patch branch from the branch at the second merge base, the merge base patch branch including a copy of the first merge base; merging the merge base patch branch with the trunk; and merging the merge base patch branch with the branch.


Find Patent Forward Citations

Loading…