Sourcetree fails to open Diffmerge for merge conflicts











up vote
0
down vote

favorite












Recently I had a fresh install of macOS. I've installed Sourctree and diffmerge and set diffmerge as the default merge tool. For some reason everytime when I select 'Resolve Conflicts -> Open External Merge Tool' sourcetree opens its waiting view and directly closes it.



My settings page in sourcetree:



enter image description here



This is how my root .gitconfig looks like when sourcetree configures diff merge for me:



[core]
excludesfile = /Users/[username]/.gitignore_global
[user]
name = ---- -----
email = -----@-----.--
[commit]
template = /Users/[username]/.stCommitMsg
[credential]
helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

[difftool "DiffMerge"]
[mergetool "DiffMerge"]
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
[merge]
tool = diffmerge
[mergetool "diffmerge"]
trustExitCode = true
cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
[difftool "sourcetree"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --nosplash "$LOCAL" "$REMOTE"
path =
[mergetool "sourcetree"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
trustExitCode = true









share|improve this question


























    up vote
    0
    down vote

    favorite












    Recently I had a fresh install of macOS. I've installed Sourctree and diffmerge and set diffmerge as the default merge tool. For some reason everytime when I select 'Resolve Conflicts -> Open External Merge Tool' sourcetree opens its waiting view and directly closes it.



    My settings page in sourcetree:



    enter image description here



    This is how my root .gitconfig looks like when sourcetree configures diff merge for me:



    [core]
    excludesfile = /Users/[username]/.gitignore_global
    [user]
    name = ---- -----
    email = -----@-----.--
    [commit]
    template = /Users/[username]/.stCommitMsg
    [credential]
    helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

    [difftool "DiffMerge"]
    [mergetool "DiffMerge"]
    [diff]
    tool = diffmerge
    [difftool "diffmerge"]
    cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
    [merge]
    tool = diffmerge
    [mergetool "diffmerge"]
    trustExitCode = true
    cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
    [difftool "sourcetree"]
    cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --nosplash "$LOCAL" "$REMOTE"
    path =
    [mergetool "sourcetree"]
    cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
    trustExitCode = true









    share|improve this question
























      up vote
      0
      down vote

      favorite









      up vote
      0
      down vote

      favorite











      Recently I had a fresh install of macOS. I've installed Sourctree and diffmerge and set diffmerge as the default merge tool. For some reason everytime when I select 'Resolve Conflicts -> Open External Merge Tool' sourcetree opens its waiting view and directly closes it.



      My settings page in sourcetree:



      enter image description here



      This is how my root .gitconfig looks like when sourcetree configures diff merge for me:



      [core]
      excludesfile = /Users/[username]/.gitignore_global
      [user]
      name = ---- -----
      email = -----@-----.--
      [commit]
      template = /Users/[username]/.stCommitMsg
      [credential]
      helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

      [difftool "DiffMerge"]
      [mergetool "DiffMerge"]
      [diff]
      tool = diffmerge
      [difftool "diffmerge"]
      cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
      [merge]
      tool = diffmerge
      [mergetool "diffmerge"]
      trustExitCode = true
      cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
      [difftool "sourcetree"]
      cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --nosplash "$LOCAL" "$REMOTE"
      path =
      [mergetool "sourcetree"]
      cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
      trustExitCode = true









      share|improve this question













      Recently I had a fresh install of macOS. I've installed Sourctree and diffmerge and set diffmerge as the default merge tool. For some reason everytime when I select 'Resolve Conflicts -> Open External Merge Tool' sourcetree opens its waiting view and directly closes it.



      My settings page in sourcetree:



      enter image description here



      This is how my root .gitconfig looks like when sourcetree configures diff merge for me:



      [core]
      excludesfile = /Users/[username]/.gitignore_global
      [user]
      name = ---- -----
      email = -----@-----.--
      [commit]
      template = /Users/[username]/.stCommitMsg
      [credential]
      helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

      [difftool "DiffMerge"]
      [mergetool "DiffMerge"]
      [diff]
      tool = diffmerge
      [difftool "diffmerge"]
      cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
      [merge]
      tool = diffmerge
      [mergetool "diffmerge"]
      trustExitCode = true
      cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
      [difftool "sourcetree"]
      cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --nosplash "$LOCAL" "$REMOTE"
      path =
      [mergetool "sourcetree"]
      cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
      trustExitCode = true






      atlassian-sourcetree diffmerge






      share|improve this question













      share|improve this question











      share|improve this question




      share|improve this question










      asked Nov 11 at 14:50









      Saren Inden

      1,69731934




      1,69731934
























          1 Answer
          1






          active

          oldest

          votes

















          up vote
          0
          down vote













          For some reason source tree sets an invalid path for the command line argument.



          To solve this I manually configured Visual Diff Tool and Merge Tool.



          Settings page in sourcetree



          enter image description here



          Diff



          Command: /usr/local/bin/diffmerge
          Arguments --nosplash "$LOCAL" "$REMOTE"



          Merge



          Command: /usr/local/bin/diffmerge
          Arguments --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"



          The --nosplash argument is optional but prevents the (in my opinion useless) pop up that you always have to close before you can start your work.



          Git config file:



          [core]
          excludesfile = /Users/[username]/.gitignore_global
          [user]
          name = ---------
          email = ---------@------.--
          [commit]
          template = /Users/[username]/.stCommitMsg
          [credential]
          helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

          [difftool "DiffMerge"]
          [mergetool "DiffMerge"]
          [diff]
          tool = diffmerge
          [difftool "diffmerge"]
          cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
          [merge]
          tool = diffmerge
          [mergetool "diffmerge"]
          trustExitCode = true
          cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
          [difftool "sourcetree"]
          cmd = /usr/local/bin/diffmerge --nosplash "$LOCAL" "$REMOTE"
          path =
          [mergetool "sourcetree"]
          cmd = /usr/local/bin/diffmerge --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
          trustExitCode = true


          More info about diffmerge command line arguments:



          Diff: https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html



          Merge: https://sourcegear.com/diffmerge/webhelp/sec__clargs__merge.html






          share|improve this answer





















            Your Answer






            StackExchange.ifUsing("editor", function () {
            StackExchange.using("externalEditor", function () {
            StackExchange.using("snippets", function () {
            StackExchange.snippets.init();
            });
            });
            }, "code-snippets");

            StackExchange.ready(function() {
            var channelOptions = {
            tags: "".split(" "),
            id: "1"
            };
            initTagRenderer("".split(" "), "".split(" "), channelOptions);

            StackExchange.using("externalEditor", function() {
            // Have to fire editor after snippets, if snippets enabled
            if (StackExchange.settings.snippets.snippetsEnabled) {
            StackExchange.using("snippets", function() {
            createEditor();
            });
            }
            else {
            createEditor();
            }
            });

            function createEditor() {
            StackExchange.prepareEditor({
            heartbeatType: 'answer',
            convertImagesToLinks: true,
            noModals: true,
            showLowRepImageUploadWarning: true,
            reputationToPostImages: 10,
            bindNavPrevention: true,
            postfix: "",
            imageUploader: {
            brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
            contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
            allowUrls: true
            },
            onDemand: true,
            discardSelector: ".discard-answer"
            ,immediatelyShowMarkdownHelp:true
            });


            }
            });














            draft saved

            draft discarded


















            StackExchange.ready(
            function () {
            StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53249870%2fsourcetree-fails-to-open-diffmerge-for-merge-conflicts%23new-answer', 'question_page');
            }
            );

            Post as a guest















            Required, but never shown

























            1 Answer
            1






            active

            oldest

            votes








            1 Answer
            1






            active

            oldest

            votes









            active

            oldest

            votes






            active

            oldest

            votes








            up vote
            0
            down vote













            For some reason source tree sets an invalid path for the command line argument.



            To solve this I manually configured Visual Diff Tool and Merge Tool.



            Settings page in sourcetree



            enter image description here



            Diff



            Command: /usr/local/bin/diffmerge
            Arguments --nosplash "$LOCAL" "$REMOTE"



            Merge



            Command: /usr/local/bin/diffmerge
            Arguments --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"



            The --nosplash argument is optional but prevents the (in my opinion useless) pop up that you always have to close before you can start your work.



            Git config file:



            [core]
            excludesfile = /Users/[username]/.gitignore_global
            [user]
            name = ---------
            email = ---------@------.--
            [commit]
            template = /Users/[username]/.stCommitMsg
            [credential]
            helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

            [difftool "DiffMerge"]
            [mergetool "DiffMerge"]
            [diff]
            tool = diffmerge
            [difftool "diffmerge"]
            cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
            [merge]
            tool = diffmerge
            [mergetool "diffmerge"]
            trustExitCode = true
            cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
            [difftool "sourcetree"]
            cmd = /usr/local/bin/diffmerge --nosplash "$LOCAL" "$REMOTE"
            path =
            [mergetool "sourcetree"]
            cmd = /usr/local/bin/diffmerge --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
            trustExitCode = true


            More info about diffmerge command line arguments:



            Diff: https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html



            Merge: https://sourcegear.com/diffmerge/webhelp/sec__clargs__merge.html






            share|improve this answer

























              up vote
              0
              down vote













              For some reason source tree sets an invalid path for the command line argument.



              To solve this I manually configured Visual Diff Tool and Merge Tool.



              Settings page in sourcetree



              enter image description here



              Diff



              Command: /usr/local/bin/diffmerge
              Arguments --nosplash "$LOCAL" "$REMOTE"



              Merge



              Command: /usr/local/bin/diffmerge
              Arguments --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"



              The --nosplash argument is optional but prevents the (in my opinion useless) pop up that you always have to close before you can start your work.



              Git config file:



              [core]
              excludesfile = /Users/[username]/.gitignore_global
              [user]
              name = ---------
              email = ---------@------.--
              [commit]
              template = /Users/[username]/.stCommitMsg
              [credential]
              helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

              [difftool "DiffMerge"]
              [mergetool "DiffMerge"]
              [diff]
              tool = diffmerge
              [difftool "diffmerge"]
              cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
              [merge]
              tool = diffmerge
              [mergetool "diffmerge"]
              trustExitCode = true
              cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
              [difftool "sourcetree"]
              cmd = /usr/local/bin/diffmerge --nosplash "$LOCAL" "$REMOTE"
              path =
              [mergetool "sourcetree"]
              cmd = /usr/local/bin/diffmerge --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
              trustExitCode = true


              More info about diffmerge command line arguments:



              Diff: https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html



              Merge: https://sourcegear.com/diffmerge/webhelp/sec__clargs__merge.html






              share|improve this answer























                up vote
                0
                down vote










                up vote
                0
                down vote









                For some reason source tree sets an invalid path for the command line argument.



                To solve this I manually configured Visual Diff Tool and Merge Tool.



                Settings page in sourcetree



                enter image description here



                Diff



                Command: /usr/local/bin/diffmerge
                Arguments --nosplash "$LOCAL" "$REMOTE"



                Merge



                Command: /usr/local/bin/diffmerge
                Arguments --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"



                The --nosplash argument is optional but prevents the (in my opinion useless) pop up that you always have to close before you can start your work.



                Git config file:



                [core]
                excludesfile = /Users/[username]/.gitignore_global
                [user]
                name = ---------
                email = ---------@------.--
                [commit]
                template = /Users/[username]/.stCommitMsg
                [credential]
                helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

                [difftool "DiffMerge"]
                [mergetool "DiffMerge"]
                [diff]
                tool = diffmerge
                [difftool "diffmerge"]
                cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
                [merge]
                tool = diffmerge
                [mergetool "diffmerge"]
                trustExitCode = true
                cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
                [difftool "sourcetree"]
                cmd = /usr/local/bin/diffmerge --nosplash "$LOCAL" "$REMOTE"
                path =
                [mergetool "sourcetree"]
                cmd = /usr/local/bin/diffmerge --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
                trustExitCode = true


                More info about diffmerge command line arguments:



                Diff: https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html



                Merge: https://sourcegear.com/diffmerge/webhelp/sec__clargs__merge.html






                share|improve this answer












                For some reason source tree sets an invalid path for the command line argument.



                To solve this I manually configured Visual Diff Tool and Merge Tool.



                Settings page in sourcetree



                enter image description here



                Diff



                Command: /usr/local/bin/diffmerge
                Arguments --nosplash "$LOCAL" "$REMOTE"



                Merge



                Command: /usr/local/bin/diffmerge
                Arguments --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"



                The --nosplash argument is optional but prevents the (in my opinion useless) pop up that you always have to close before you can start your work.



                Git config file:



                [core]
                excludesfile = /Users/[username]/.gitignore_global
                [user]
                name = ---------
                email = ---------@------.--
                [commit]
                template = /Users/[username]/.stCommitMsg
                [credential]
                helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false -Djava.net.useSystemProxies=true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jar

                [difftool "DiffMerge"]
                [mergetool "DiffMerge"]
                [diff]
                tool = diffmerge
                [difftool "diffmerge"]
                cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
                [merge]
                tool = diffmerge
                [mergetool "diffmerge"]
                trustExitCode = true
                cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
                [difftool "sourcetree"]
                cmd = /usr/local/bin/diffmerge --nosplash "$LOCAL" "$REMOTE"
                path =
                [mergetool "sourcetree"]
                cmd = /usr/local/bin/diffmerge --nosplash --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
                trustExitCode = true


                More info about diffmerge command line arguments:



                Diff: https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html



                Merge: https://sourcegear.com/diffmerge/webhelp/sec__clargs__merge.html







                share|improve this answer












                share|improve this answer



                share|improve this answer










                answered Nov 11 at 14:50









                Saren Inden

                1,69731934




                1,69731934






























                    draft saved

                    draft discarded




















































                    Thanks for contributing an answer to Stack Overflow!


                    • Please be sure to answer the question. Provide details and share your research!

                    But avoid



                    • Asking for help, clarification, or responding to other answers.

                    • Making statements based on opinion; back them up with references or personal experience.


                    To learn more, see our tips on writing great answers.





                    Some of your past answers have not been well-received, and you're in danger of being blocked from answering.


                    Please pay close attention to the following guidance:


                    • Please be sure to answer the question. Provide details and share your research!

                    But avoid



                    • Asking for help, clarification, or responding to other answers.

                    • Making statements based on opinion; back them up with references or personal experience.


                    To learn more, see our tips on writing great answers.




                    draft saved


                    draft discarded














                    StackExchange.ready(
                    function () {
                    StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53249870%2fsourcetree-fails-to-open-diffmerge-for-merge-conflicts%23new-answer', 'question_page');
                    }
                    );

                    Post as a guest















                    Required, but never shown





















































                    Required, but never shown














                    Required, but never shown












                    Required, but never shown







                    Required, but never shown

































                    Required, but never shown














                    Required, but never shown












                    Required, but never shown







                    Required, but never shown







                    Popular posts from this blog

                    Full-time equivalent

                    さくらももこ

                    13 indicted, 8 arrested in Calif. drug cartel investigation