1

Our mergetool (BeyondCompare) will suggest merge resolutions and not list these as a conflict. Is there a way to run git merge to accept these resolutions?

ti7
  • 16,375
  • 6
  • 40
  • 68
Marcus Leon
  • 55,199
  • 118
  • 297
  • 429
  • can you provide more information about the strategy it (BeyondCompare) uses (ie. is it a custom one)? it might be sufficient to directly `git merge` if it provides a public strategy – ti7 Apr 18 '23 at 23:22
  • Default merge strategy... – Marcus Leon Apr 19 '23 at 02:02

1 Answers1

2

Solved it with these entries in .gitconfig:

[merge]
    tool = bc3
[mergetool "bc3"]
        cmd =  \"c:\\Program Files (x86)\\Beyond Compare 4\\bcomp.exe\" -automerge -reviewconflicts $LOCAL $REMOTE $BASE $MERGED
        trustExitCode = true

This answer was helped along with the comments from this here: Beyond Compare - automatically merge "conflicted" files in working copy (if possible)

Marcus Leon
  • 55,199
  • 118
  • 297
  • 429