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.

Patent No.:

US 9430229 B1

Date of Patent:

Aug. 30, 2016

Filed:

Mar. 14, 2014

Merge previewing in a version control system

Applicant:

Atlassian Pty Ltd, Sydney, AU;

Inventors:

Erik Van Zijst, San Mateo, CA (US);

Brodie Glen Rao, San Francisco, CA (US);

Bryan Paul Turner, The Rocks, AU;

Michael Gerardus Heemskerk, Heemstede, NL;

Assignee:

ATLASSIAN PTY LTD, Sydney, AU;

Attorney:

Hickman Palermo Becker Bingham LLP

Primary Examiner:

Insun Kang

Int. Cl.

CPC ...

G06F 9/44 (2006.01);

U.S. Cl.

CPC ...

G06F 8/71 (2013.01);

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.

Find Patent Forward Citations

Van Zijst, Erik. (2016). Merge previewing in a version control system (U.S. Patent No. 9430229). U.S. Patent and Trademark Office. https://idiyas.com/patent/badge/9430229

Data source: USPTO (United States Patent and Trademark Office) public patent records. Weekly synchronization. How IDiyas builds this profile