Results 1 to 5 of 5
  1. #1
    Join Date
    Feb 2016
    Posts
    5

    Unhappy SourceTree and BC as external merge tool not working

    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?

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,788

    Default

    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.
    Aaron P Scooter Software

  3. #3
    Join Date
    Feb 2016
    Posts
    5

    Default

    (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.

  4. #4
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,788

    Default

    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.
    Last edited by Aaron; 08-Mar-2016 at 11:08 AM. Reason: update
    Aaron P Scooter Software

  5. #5
    Join Date
    Feb 2016
    Posts
    5

    Default

    Yes, it's working now. Thanks.

Tags for this Thread

Posting Permissions

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