Announcement

Collapse
No announcement yet.

git mergetool issue

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • git mergetool issue

    I have configured Beyond Compare 4 for git within Linux as described here:
    https://www.scootersoftware.com/supp...b_vcs#gitlinux

    When I execute "git mergetool" to resolve conflicts, Beyond Compare launches but sits at the home screen. The 3-way merge does not start automatically. I see the "Text Merge" option and have confirmed I am properly licensed for the Pro Edition via Help->About Beyond Compare.

    If I manually specify a specific file ("git mergetool path/to/conflict/file") I get the same result.

    Any ideas?

    Thanks,
    Gerard

  • #2
    What is the output of "git --version" on your system?

    Also, please post the diff and merge sections of your .gitconfig file.
    Chris K Scooter Software

    Comment


    • #3
      Originally posted by Chris View Post
      What is the output of "git --version" on your system?
      git version 2.9.3

      Originally posted by Chris View Post
      Also, please post the diff and merge sections of your .gitconfig file.
      [merge]
      tool = bc3
      [mergetool "bc3"]
      trustExitCode = true
      cmd = "/apps/bcompare_4.2.6/bin/bcompare "

      (no diff section)

      Thanks,
      Gerard

      Comment


      • #4
        Hello,

        Would it be possible to update Git? That version is a few behind. One other thing to try is newer versions allow "bc" instead of "bc3", and there may be a change in behavior there. I would suggest updating the .gitconfig and then rebooting (just to be certain it isn't using a cached version), to see if this has an impact.

        Also, we've since variance in behavior/bugs when dealing with different Gits packaged with different clients (vanilla Git vs. GitHub's Git); how/where did you get yours?

        Also, which Linux OS and version are you running?
        Aaron P Scooter Software

        Comment


        • #5
          Originally posted by Aaron View Post
          Would it be possible to update Git? That version is a few behind.
          Done. I'm now using git 2.19.0

          Originally posted by Aaron View Post
          One other thing to try is newer versions allow "bc" instead of "bc3", and there may be a change in behavior there.
          Done. Here is the relevant .gitconfig content:

          [merge]
          tool = bc
          [mergetool "bc"]
          trustExitCode = true
          cmd = "/apps/bcompare_4.2.6/bin/bcompare"
          [diff]
          tool = bc
          [difftool "bc"]
          cmd = /apps/bcompare_4.2.6/bin/bcompare

          Originally posted by Aaron View Post
          Also, we've since variance in behavior/bugs when dealing with different Gits packaged with different clients (vanilla Git vs. GitHub's Git); how/where did you get yours?
          Short answer: My IT department installed it. I believe/it looks like it's vanilla git.

          Originally posted by Aaron View Post
          Also, which Linux OS and version are you running?
          Red Hat Enterprise Linux 7.4

          Here is what I see running, for what it's worth, when attempting to open the difftool with a given file:
          $ ps aux | grep diff
          gerard 27256 0.0 0.0 116832 1224 pts/2 S+ 12:43 0:00 git difftool include/config/tristate.conf
          gerard 27257 0.1 0.0 436200 11032 pts/2 S+ 12:43 0:00 /apps/git_2.19.0/libexec/git-core/git diff include/config/tristate.conf
          gerard 27278 0.0 0.0 113272 1616 pts/2 S+ 12:43 0:00 /bin/sh /apps/git_2.19.0/libexec/git-core/git-difftool--helper include/config/tristate.conf /tmp/QlZH5p_tristate.conf 1d6a7fa8dfcb47beac9940fb393388b4ca2e9f82 100644 include/config/tristate.conf 0000000000000000000000000000000000000000 100644
          gerard 27302 0.0 0.0 113272 772 pts/2 S+ 12:43 0:00 /bin/sh /apps/git_2.19.0/libexec/git-core/git-difftool--helper include/config/tristate.conf /tmp/QlZH5p_tristate.conf 1d6a7fa8dfcb47beac9940fb393388b4ca2e9f82 100644 include/config/tristate.conf 0000000000000000000000000000000000000000 100644


          $ ps aux | grep bcompare
          gerard 27303 0.0 0.0 113136 1432 pts/2 S+ 12:43 0:00 /bin/sh /apps/bcompare_4.2.6/bin/bcompare
          gerard 27313 0.0 0.3 802152 59560 pts/2 Sl+ 12:43 0:00 /apps/bcompare_4.2.6/bin/bcompare

          I would have expected to see a couple parameters passed to bcompare.

          Thanks,
          Gerard

          Comment


          • #6
            Hello,

            Ah, thanks for the full .gitconfig. Re-reading it, I notice you are defining cmd instead of path. For newer versions of git, you can define path instead (which does not need parameters), while cmd does. We have examples of both here:
            http://www.scootersoftware.com/suppo...b_vcs#gitlinux

            You could either add the parameters, or remove the current definition and use the KB article instructions to re-add them.
            Aaron P Scooter Software

            Comment


            • #7
              Thanks! That was the trick - using path instead of cmd. I had not tried as the "path" references are only under the Windows section and I am doing this in Linux.

              Gerard

              Comment

              Working...
              X