Merge tools#

The Ansys SCADE Git Extensions merge tools address Ansys SCADE files where default textual merge is not appropriate. They merge files derived from a common ancestor, using the merge 3 technique, and are intended to be used as part of the merge feature of a version control system such as Git.

The post-installation step of this package registers the tools to Git.

If you are using a different version control system, please refer to its documentation for declaring the merge tools. They all have the following interface:

usage: <tool> [-h] -l <local> -r <remote> -b <base> -m <merged>

options:
-h, --help            show this help message and exit
-l <local>, --local <local>
                        local file
-r <remote>, --remote <remote>
                        remote file
-b <base>, --base <base>
                        base file
-m <merged>, --merged <merged>
                        merged file
Show Source