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. 10, 2026

Filed:

Feb. 28, 2024
Applicant:

Rockwell Automation Technologies, Inc., Mayfield Heights, OH (US);

Inventor:

Jorge Monasterio, San Diego, CA (US);

Assignee:

ROCKWELL AUTOMATION TECHNOLOGIES, INC., Mayfield Heights, OH (US);

Attorney:
Primary Examiner:
Int. Cl.
CPC ...
G06F 8/658 (2018.01); G06F 8/30 (2018.01); G06F 8/33 (2018.01); G06F 8/70 (2018.01); G06F 8/71 (2018.01); G06F 8/73 (2018.01); G06F 8/75 (2018.01);
U.S. Cl.
CPC ...
G06F 8/658 (2018.02); G06F 8/30 (2013.01); G06F 8/31 (2013.01); G06F 8/33 (2013.01); G06F 8/70 (2013.01); G06F 8/71 (2013.01); G06F 8/73 (2013.01); G06F 8/75 (2013.01);
Abstract

Various systems and methods are presented regarding using generative artificial intelligence/machine language (AI/ML) to resolve a merge conflict between two or more versions of a program code. The program code can be industrial automation software utilized to control one or more PLCs in an industrial environment. Interaction with the program code can be via a programming tool that presents the program code in a human readable format, while the AI/ML can be applied to the underlying source code. Hence, while the source code is applied to the PLC, the programming tool enables interaction various human readable summaries of the program code and respective options available to resolve the merge conflict. Accordingly, a process engineer, or suchlike, does not have to be familiar with the source code format to readily understand a summary of the merge conflict or one or more options available to correct the conflict.


Find Patent Forward Citations

Quick Actions:

Monasterio, Jorge. (2026). Automated system for resolving version control merge conflicts (U.S. Patent No. 12792341). U.S. Patent and Trademark Office. https://idiyas.com/patent/badge/12792341

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

Loading…