Results 1 to 3 of 3
  1. #1
    Join Date
    Nov 2007
    Posts
    28

    Default Should "git mergetool" work to diff a conflicted file?

    I am using BC Version 4.1.9 (build 21719) (pro version) on Mac 10.11.6 with Git git version 2.10.2 (hub version 2.2.9)

    I am in a git repo where I tried to do a merge and there was a single file that had a conflict (circle.yml).

    When I try to run "git mergetool" or "git mergetool circle.yml", BC comes up, but it shows only a left side file, and the contents in that pane have the conflict markers in it. i.e.:

    ---
    blah
    blah
    <<<<<<< HEAD
    other
    other
    =======
    foo
    foo
    >>>>>>> master
    last
    last


    Should I be able to use mergetool on this file? Am I running the merge wrong for what I'm trying to do?

    Here are my git config settings:

    $ git config -l | grep 'diff\|merge'
    branch.autosetupmerge=true
    alias.up=!git remote update -p; git merge --ff-only @{u}
    diff.tool=bc3
    merge.tool=bc3
    mergetool.bc3=trustExitCode
    branch.master.merge=refs/heads/master

  2. #2
    Join Date
    Nov 2007
    Posts
    28

    Default

    ::sigh:: nevermind. I tried one more time and it worked. maybe I had an issue with a leftover config, but more likely, I was actually being fooled by the "---" at the top of the file. I thought it was an artifact of the merge conflict, but it was actually a line in the new file!

    I seem to be working fine now.

  3. #3
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,378

    Default

    That's good to hear. If you made any edits to the config to help troubleshoot, old settings sometimes stick around until closing any open processes.
    Aaron P Scooter Software

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •