TortoiseGit - Merge Setting string

[mikethestone]

What is the setting to use in BC3 Standard Edition to do a successful merge?

I have under Merge Tool:
"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

But it doesn't accept my changes - and it keeps saying merge conflicts remain.

Your help appreciated!

Mike Stone

[Aaron]

BC3 Std edition does not support the Text Merge session type, so you would need to use only 2 panes with a potential 3rd parameter as a /savetarget (where any save to either side saves to this new target). This is how BC2 handled a merge scenario.


With BC3 Pro, we added a Text Merge session type, which would work with the above command line.
http://www.scootersoftware.com/shop.php?zz=kb_editions
http://www.scootersoftware.com/morei...moreinfo_merge

We have detailed TortoiseGit instructions here:
http://www.scootersoftware.com/suppo...cs#tortoisegit


If you would like to trial the Text Merge session (and other BC3 Pro features), you can revert to trial mode following this guide:
http://www.scootersoftware.com/suppo...?zz=kb_evalpro

If this works well for you and fully meets your needs, you can contact us about upgrading your license for the price difference. If you decide to revert back to Standard, you can re-register the 'trial' with your original key. You do not need to uninstall/reinstall or anything like that, but it is always recommended to have a periodic backup of your settings (Tools menu -> Export).