Announcement

Collapse
No announcement yet.

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

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

  • 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

  • Aaron
    replied
    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.

    Leave a comment:


  • DEinspanjer
    replied
    ::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.

    Leave a comment:

Working...
X