The Mathworks, Inc.

Timothy Hosey

Ebrahim Mehran Mestchian

Robert Olson Aberg

A device receives a conflicted file, with a structured data format, that includes a conflict marker that does not comply with the structured data format. The conflict marker identifies first edited information and second edited information included in the conflicted file. The first edited information and the second edited information comply with the structured data format, and include information that has been modified in different versions of a shared file to create the conflicted file. The device detects that the conflicted file includes the conflict marker, and identifies, based on the detected conflict marker, the first edited information and the second edited information. The device determines that at least one of the first edited information or the second edited information is to be provided to the application for processing, and provides, based on the determining, the first edited information or the second edited information to the application for processing.

Conflict markup tolerant input stream

A device receives model information associated with a modeling application. The device determines first and second conflicting information in the model information. The first and second conflicting information describe different characteristics of a model described by the model information. The device formats the first and second conflicting information in a manner that designates the first conflicting information as a first variant of the model and the second conflicting information as a second variant of the model. The model, when executed with the first variant, behaves in a different manner than when executed with the second variant. The device provides the formatted first and second conflicting information to the modeling application, provides information that identifies the first and second variant, receives a user selection of information that identifies the first variant or second variant, and executes the model based on the user selection.

Growing community of inventors

Longstanton, United Kingdom

Timothy Hosey