The three-way merge function allows you to merge updates from Theirs and Mine versions of link set files in a source control system with respect to a common ancestor Base link set file. The function automatically merges the changes from Theirs and Mine link set files into the Target Link Set file when there are no conflicts. If there are conflicts, the function copies link information from the Theirs link set file to the Target link set file. Subsequently, you can manually modify the Target link set by using the Requirements Editor to resolve the conflicts. This function can be used with either a source control system integrated with Simulink Projects or an external source control system.
You must have a Simulink Requirements installation and an active license because the three-way merge function internally uses the public functions provided by Simulink Requirements to perform all link set operations.
Shashidhar Honnungar (2020). Three-Way Merge for Link Set files in Simulink Requirements (https://www.mathworks.com/matlabcentral/fileexchange/75673-three-way-merge-for-link-set-files-in-simulink-requirements), MATLAB Central File Exchange. Retrieved .
Find the treasures in MATLAB Central and discover how the community can help you!Start Hunting!