SourceTree and BC as external merge tool not working

[philcruz]

I have BC4 set up as the external diff and merge tool in SourceTree 2.2.2.

http://www.screencast.com/t/193uM7zL


It works for diff but when I launch a merge BC doesn't do anything but addingitional _LOCAL, _REMOTE, etc. files get created.

http://www.screencast.com/t/e7xnU1sR

What am I missing?

[Aaron]

Hello,

Are you a registered Pro user? You can verify your license type in the Beyond Compare menu -> About Beyond Compare dialog. Pro is required for the Text Merge session, which is used for 3 way Merging.

If Pro, have you used the Beyond Compare menu to Install Command Line Tools? I would assume so because you mention that diffing works, but I'd like to double check.

[philcruz]

(Not sure why I didn't get an email notification about your reply but...)

Yes, I'm a registered Pro user and I did install the Command Line Tools. Let me know what I should try next. Thanks.

[Aaron]

Hello,

Testing with SourceTree 2.2.3 (and BC 4.1.4) appears to work well using the built in Merge Tool: "Beyond Compare" from the dropdown. If you update, does this help get this working for you?

I should clarify: this is performing a merge on a conflict of a single file that has detected conflicts as the test case between two branches.

[philcruz]

Yes, it's working now. Thanks.