Question

我正在使用MATLAB的appdesigner。它生成一个二进制文件，它是包含布局的XML的压缩版本，另一个文件包含代码。作为一个二进制文件，Git无法想象diff和它合并。我已经检查了Customize External Source Control to Use MATLAB for Diff and Merge，但我无法通过Git解决有关如何在Mac OS上执行此操作的详细信息。

我的git repo配置如下：

[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
    ignorecase = true
    precomposeunicode = true
[remote "origin"]
            url = https://p_ackermann@bitbucket.org/mhealth_rwth/ma_pascal_ackermann.git
            fetch = +refs/heads/*:refs/remotes/origin/*
    [branch "master"]
            remote = origin
            merge = refs/heads/master
    [diff]
        tool = MATLAB-Diff
    [difftool "MATLAB-Diff"]
            cmd = /Applications/MATLAB_R2017b.app/bin/maci64/mlDiff "$REMOTE" "$LOCAL"
    [merge]
        tool = MATLAB-Merge
    [mergetool "MATLAB-Merge"]
            cmd = /Applications/MATLAB_R2017b.app/bin/maci64/mlMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"

但是git diff someApp.mlapp给了我：

diff --git a / someApp.mlapp b / someApp.mlapp

索引0ae9a33..18fe4e4 100644

二进制文件a / someApp.mlapp和b / someApp.mlapp不同

尝试使用git difftool打开diff工具，在MATLAB中给出了一个警告窗口：

文件someApp.mlapp未找到

我被困在这里。

非常感谢你的帮助！

如何在Mac OSX上为Git设置MATLAB diff和merge

0 个答案: